Changeset 141402 in webkit

Timestamp:

Jan 31, 2013, 4:43:15 AM (13 years ago)

Author:

kov@webkit.org

Message:

[GTK] run-gtk-tests does not respect the -d argument
​https://bugs.webkit.org/show_bug.cgi?id=107822

Reviewed by Philippe Normand.

• Scripts/run-gtk-tests:

(TestRunner.init): use the value for the debug option to decide what
build_type to request a path for.

• gtk/common.py:

(get_build_path): now accepts a build_type argument instead of trying both
Release and Debug in order, defaults to release.
(build_path): takes and passes a build_type argument, no default value.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/run-gtk-tests (modified) (1 diff)
• gtk/common.py (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-01-31  Gustavo Noronha Silva  <gns@gnome.org>
+
+        [GTK] run-gtk-tests does not respect the -d argument
+        https://bugs.webkit.org/show_bug.cgi?id=107822
+
+        Reviewed by Philippe Normand.
+
+        * Scripts/run-gtk-tests:
+        (TestRunner.__init__): use the value for the debug option to decide what
+        build_type to request a path for.
+        * gtk/common.py:
+        (get_build_path): now accepts a build_type argument instead of trying both
+        Release and Debug in order, defaults to release.
+        (build_path): takes and passes a build_type argument, no default value.
+
 2013-01-31  Christophe Dumez  <dchris@gmail.com>
 

trunk/Tools/Scripts/run-gtk-tests

@@ -87 +87 @@
     def __init__(self, options, tests=[]):
         self._options = options
-        self._programs_path = common.build_path("Programs")
+
+        if options.debug:
+            build_type = 'Debug'
+        else:
+            build_type = 'Release'
+
+        self._programs_path = common.build_path(build_type, "Programs")
         self._tests = self._get_tests(tests)
         self._skipped_tests = TestRunner.SKIPPED

trunk/Tools/gtk/common.py

@@ -37 +37 @@
 
 
-def get_build_path():
+def get_build_path(build_type='Release'):
     global build_dir
     if build_dir:
@@ -58 +58 @@
         return build_dir
 
-    for build_type in ('Release', 'Debug'):
+    if build_type:
         build_dir = top_level_path('WebKitBuild', build_type)
         if is_valid_build_directory(build_dir):
@@ -80 +80 @@
 
 
-def build_path(*args):
-    return os.path.join(*(get_build_path(),) + args)
+def build_path(build_type, *args):
+    return os.path.join(*(get_build_path(build_type),) + args)