From fbf9d7c153d852c7afd3e3c3d9c3e5ab35cc1343 Mon Sep 17 00:00:00 2001 From: "carlosgc@webkit.org" Date: Mon, 2 Jul 2012 15:54:34 +0000 Subject: [PATCH] [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. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@121681 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Tools/ChangeLog | 11 +++++++++++ Tools/Scripts/new-run-webkit-tests | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Tools/ChangeLog b/Tools/ChangeLog index ad46cf3..b56a0c8 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,3 +1,14 @@ +2012-07-02 Carlos Garcia Campos + + [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 [Qt] Simplify detection of non-installed module file diff --git a/Tools/Scripts/new-run-webkit-tests b/Tools/Scripts/new-run-webkit-tests index 1c3d3b1..c771fd6 100755 --- a/Tools/Scripts/new-run-webkit-tests +++ b/Tools/Scripts/new-run-webkit-tests @@ -53,7 +53,7 @@ if __name__ == '__main__': # 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) -- 2.7.4