Changeset 161268 in webkit

Timestamp:

Jan 3, 2014 10:49:25 AM (10 years ago)

Author:

Carlos Garcia Campos

Message:

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.

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+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>
 

trunk/Tools/Scripts/run-gtk-tests

@@ -197 +197 @@
         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
 

trunk/Tools/gtk/common.py

@@ -25 +25 @@
 build_dir = None
 library_build_dir = None
+tests_library_build_dir = None
 is_cmake = None
 build_types = ('Release', 'Debug')
@@ -49 +50 @@
             library_build_dir = build_path('.libs', *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