Title: [141402] trunk/Tools
- Revision
- 141402
- Author
- k...@webkit.org
- Date
- 2013-01-31 04:43:15 -0800 (Thu, 31 Jan 2013)
Log 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.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (141401 => 141402)
--- trunk/Tools/ChangeLog 2013-01-31 12:04:09 UTC (rev 141401)
+++ trunk/Tools/ChangeLog 2013-01-31 12:43:15 UTC (rev 141402)
@@ -1,3 +1,18 @@
+2013-01-31 Gustavo Noronha Silva <g...@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 <dch...@gmail.com>
Update Christophe Dumez's email address
Modified: trunk/Tools/Scripts/run-gtk-tests (141401 => 141402)
--- trunk/Tools/Scripts/run-gtk-tests 2013-01-31 12:04:09 UTC (rev 141401)
+++ trunk/Tools/Scripts/run-gtk-tests 2013-01-31 12:43:15 UTC (rev 141402)
@@ -86,7 +86,13 @@
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
if not sys.stdout.isatty():
Modified: trunk/Tools/gtk/common.py (141401 => 141402)
--- trunk/Tools/gtk/common.py 2013-01-31 12:04:09 UTC (rev 141401)
+++ trunk/Tools/gtk/common.py 2013-01-31 12:43:15 UTC (rev 141402)
@@ -36,7 +36,7 @@
return os.path.join(*((script_path('..', '..'),) + args))
-def get_build_path():
+def get_build_path(build_type='Release'):
global build_dir
if build_dir:
return build_dir
@@ -57,7 +57,7 @@
if is_valid_build_directory(build_dir):
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):
return build_dir
@@ -79,8 +79,8 @@
sys.exit(1)
-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)
def pkg_config_file_variable(package, variable):
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
