Title: [121681] trunk/Tools
- Revision
- 121681
- Author
- [email protected]
- Date
- 2012-07-02 08:54:34 -0700 (Mon, 02 Jul 2012)
Log Message
[GTK] Don't run the tests with jhbuild wrapper if it's already running under jhbuild
https://bugs.webkit.org/show_bug.cgi?id=89435
Reviewed by Martin Robinson.
* Scripts/new-run-webkit-tests: Don't run the tests with the
jhbuild wrapper if there isn't a Dependencies directory inside the
build directory.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (121680 => 121681)
--- trunk/Tools/ChangeLog 2012-07-02 15:32:27 UTC (rev 121680)
+++ trunk/Tools/ChangeLog 2012-07-02 15:54:34 UTC (rev 121681)
@@ -1,3 +1,14 @@
+2012-07-02 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Don't run the tests with jhbuild wrapper if it's already running under jhbuild
+ https://bugs.webkit.org/show_bug.cgi?id=89435
+
+ Reviewed by Martin Robinson.
+
+ * Scripts/new-run-webkit-tests: Don't run the tests with the
+ jhbuild wrapper if there isn't a Dependencies directory inside the
+ build directory.
+
2012-06-29 Oswald Buddenhagen <[email protected]>
[Qt] Simplify detection of non-installed module file
Modified: trunk/Tools/Scripts/new-run-webkit-tests (121680 => 121681)
--- trunk/Tools/Scripts/new-run-webkit-tests 2012-07-02 15:32:27 UTC (rev 121680)
+++ trunk/Tools/Scripts/new-run-webkit-tests 2012-07-02 15:54:34 UTC (rev 121681)
@@ -53,7 +53,7 @@
# Wrap the NRWT process in the jhbuild environment so DRT or WKTR
# doesn't need to do it and their process id as reported by
# subprocess.Popen is not jhbuild's.
- if '--gtk' in sys.argv[1:]:
+ if '--gtk' in sys.argv[1:] and os.path.exists(os.path.join(script_dir, '..', '..', 'WebKitBuild', 'Dependencies')):
cmd.insert(1, os.path.join(script_dir, '..', 'gtk', 'run-with-jhbuild'))
proc = subprocess.Popen(cmd, env=env)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
