Changeset 161214 in webkit

Timestamp:

Jan 2, 2014 11:45:58 AM (10 years ago)

Author:

Martin Robinson

Message:

[GTK] [CMake] run-gtk-tests should run with the cmake build
​https://bugs.webkit.org/show_bug.cgi?id=126341

Reviewed by Carlos Garcia Campos.

• Scripts/run-gtk-tests:

(TestRunner.init): Use the new calling conventions for the common script.
(TestRunner._setup_testing_environment): Ditto.

• gtk/common.py:

(set_build_types): Added set_build_types, to avoid having build_type arguments
for all functions in common.
(binary_build_path): Added this function which gets the path to the built binaries.
(get_build_path): Removed the build_types argument.
(build_path): Removed the build_types argument and call get_build_path directly now.

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2014-01-02  Martin Robinson  <mrobinson@igalia.com>
+
+        [GTK] [CMake] run-gtk-tests should run with the cmake build
+        https://bugs.webkit.org/show_bug.cgi?id=126341
+
+        Reviewed by Carlos Garcia Campos.
+
+        * Scripts/run-gtk-tests:
+        (TestRunner.__init__): Use the new calling conventions for the common script.
+        (TestRunner._setup_testing_environment): Ditto.
+        * gtk/common.py:
+        (set_build_types): Added set_build_types, to avoid having build_type arguments
+        for all functions in common.
+        (binary_build_path): Added this function which gets the path to the built binaries.
+        (get_build_path): Removed the build_types argument.
+        (build_path): Removed the build_types argument and call get_build_path directly now.
+
 2014-01-02  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Tools/Scripts/run-gtk-tests

@@ -92 +92 @@
     def __init__(self, options, tests=[]):
         self._options = options
+
         self._build_type = "Debug" if self._options.debug else "Release"
-
-        self._programs_path = common.build_path_for_build_types((self._build_type,), "Programs")
+        common.set_build_types((self._build_type,))
+
+        self._programs_path = common.binary_build_path()
         self._tests = self._get_tests(tests)
         self._skipped_tests = TestRunner.SKIPPED
@@ -195 +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.build_path_for_build_types((self._build_type,), "Libraries")
+        self._test_env["TEST_WEBKIT_API_WEBKIT2_INJECTED_BUNDLE_PATH"] = common.library_build_path()
         self._test_env["WEBKIT_EXEC_PATH"] = self._programs_path
 

trunk/Tools/gtk/common.py

@@ -26 +26 @@
 library_build_dir = None
 is_cmake = None
+build_types = ('Release', 'Debug')
+
+
+def set_build_types(new_build_types):
+    global build_types
+    build_types = new_build_types
 
 
@@ -45 +51 @@
 
 
+def binary_build_path(*args):
+    global library_build_dir
+    if not library_build_dir:
+        if is_cmake_build():
+            library_build_dir = build_path('bin', *args)
+        else:
+            library_build_dir = build_path('Programs', *args)
+    return library_build_dir
+
+
 def script_path(*args):
     global script_dir
@@ -56 +72 @@
 
 
-def get_build_path(build_types=('Release', 'Debug'), fatal=True):
+def get_build_path(fatal=True):
     global build_dir
     if build_dir:
@@ -81 +97 @@
         return build_dir
 
+    global build_types
     for build_type in build_types:
         build_dir = top_level_path('WebKitBuild', build_type)
@@ -104 +121 @@
 
 
-def build_path_for_build_types(build_types, *args):
-    return os.path.join(*(get_build_path(build_types),) + args)
-
-
 def build_path(*args):
-    return build_path_for_build_types(('Release', 'Debug'), *args)
+    return os.path.join(*(get_build_path(),) + args)