REGRESSION(r161214): [GTK] WebKit2 C API tests fail to run after r161214
authorcarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 3 Jan 2014 18:49:25 +0000 (18:49 +0000)
committercarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 3 Jan 2014 18:49:25 +0000 (18:49 +0000)
https://bugs.webkit.org/show_bug.cgi?id=126430

Reviewed by Martin Robinson.

* Scripts/run-gtk-tests:
(TestRunner._setup_testing_environment):
* gtk/common.py: Use common.tests_library_build_path() instead.
(tests_library_build_path): Helper funtion that returns the path
where the tests libraries are built.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@161268 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/Scripts/run-gtk-tests
Tools/gtk/common.py

index 4c6b8e3..a695a69 100644 (file)
@@ -1,3 +1,16 @@
+2014-01-03  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        REGRESSION(r161214): [GTK] WebKit2 C API tests fail to run after r161214
+        https://bugs.webkit.org/show_bug.cgi?id=126430
+
+        Reviewed by Martin Robinson.
+
+        * Scripts/run-gtk-tests:
+        (TestRunner._setup_testing_environment):
+        * gtk/common.py: Use common.tests_library_build_path() instead.
+        (tests_library_build_path): Helper funtion that returns the path
+        where the tests libraries are built.
+
 2014-01-03  Martin Robinson  <mrobinson@igalia.com>
 
         [CMake] Build TestWebKitAPI tests into a directory structure
index a2771ff..e6b406a 100755 (executable)
@@ -196,7 +196,7 @@ class TestRunner:
         self._test_env = os.environ
         self._test_env['GSETTINGS_BACKEND'] = 'memory'
         self._test_env["TEST_WEBKIT_API_WEBKIT2_RESOURCES_PATH"] = common.top_level_path("Tools", "TestWebKitAPI", "Tests", "WebKit2")
-        self._test_env["TEST_WEBKIT_API_WEBKIT2_INJECTED_BUNDLE_PATH"] = common.library_build_path()
+        self._test_env["TEST_WEBKIT_API_WEBKIT2_INJECTED_BUNDLE_PATH"] = common.tests_library_build_path()
         self._test_env["WEBKIT_EXEC_PATH"] = self._programs_path
 
         if not self._run_xvfb():
index 5c4b75f..02db932 100644 (file)
@@ -24,6 +24,7 @@ import sys
 script_dir = None
 build_dir = None
 library_build_dir = None
+tests_library_build_dir = None
 is_cmake = None
 build_types = ('Release', 'Debug')
 
@@ -50,6 +51,16 @@ def library_build_path(*args):
     return library_build_dir
 
 
+def tests_library_build_path(*args):
+    if is_cmake_build():
+        return library_build_path(*args)
+
+    global tests_library_build_dir
+    if not tests_library_build_dir:
+        tests_library_build_dir = build_path('Libraries', *args)
+    return tests_library_build_dir
+
+
 def binary_build_path(*args):
     global library_build_dir
     if not library_build_dir: