Title: [161268] trunk/Tools
- Revision
- 161268
- Author
- [email protected]
- Date
- 2014-01-03 10:49:25 -0800 (Fri, 03 Jan 2014)
Log 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.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (161267 => 161268)
--- trunk/Tools/ChangeLog 2014-01-03 18:41:26 UTC (rev 161267)
+++ trunk/Tools/ChangeLog 2014-01-03 18:49:25 UTC (rev 161268)
@@ -1,3 +1,16 @@
+2014-01-03 Carlos Garcia Campos <[email protected]>
+
+ 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 <[email protected]>
[CMake] Build TestWebKitAPI tests into a directory structure
Modified: trunk/Tools/Scripts/run-gtk-tests (161267 => 161268)
--- trunk/Tools/Scripts/run-gtk-tests 2014-01-03 18:41:26 UTC (rev 161267)
+++ trunk/Tools/Scripts/run-gtk-tests 2014-01-03 18:49:25 UTC (rev 161268)
@@ -196,7 +196,7 @@
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():
Modified: trunk/Tools/gtk/common.py (161267 => 161268)
--- trunk/Tools/gtk/common.py 2014-01-03 18:41:26 UTC (rev 161267)
+++ trunk/Tools/gtk/common.py 2014-01-03 18:49:25 UTC (rev 161268)
@@ -24,6 +24,7 @@
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 @@
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:
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
