Title: [221295] trunk/Tools
- Revision
- 221295
- Author
- [email protected]
- Date
- 2017-08-29 07:01:47 -0700 (Tue, 29 Aug 2017)
Log Message
Unreviewed. REGRESSION(r221219): Fix unit tests using resources from WebKit directory.
The WebKit2 directory was renamed as WebKit in r221219, but neither run-gtk-tests script nor
Test::getResourcesDir() were updated to use the new name.
* Scripts/run-gtk-tests:
(TestRunner._setup_testing_environment):
* TestWebKitAPI/glib/WebKitGLib/TestMain.h:
(Test::getResourcesDir):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (221294 => 221295)
--- trunk/Tools/ChangeLog 2017-08-29 11:30:49 UTC (rev 221294)
+++ trunk/Tools/ChangeLog 2017-08-29 14:01:47 UTC (rev 221295)
@@ -1,3 +1,15 @@
+2017-08-29 Carlos Garcia Campos <[email protected]>
+
+ Unreviewed. REGRESSION(r221219): Fix unit tests using resources from WebKit directory.
+
+ The WebKit2 directory was renamed as WebKit in r221219, but neither run-gtk-tests script nor
+ Test::getResourcesDir() were updated to use the new name.
+
+ * Scripts/run-gtk-tests:
+ (TestRunner._setup_testing_environment):
+ * TestWebKitAPI/glib/WebKitGLib/TestMain.h:
+ (Test::getResourcesDir):
+
2017-08-28 Eric Carlson <[email protected]>
Logger should use makeString instead of String::format
Modified: trunk/Tools/Scripts/run-gtk-tests (221294 => 221295)
--- trunk/Tools/Scripts/run-gtk-tests 2017-08-29 11:30:49 UTC (rev 221294)
+++ trunk/Tools/Scripts/run-gtk-tests 2017-08-29 14:01:47 UTC (rev 221295)
@@ -217,7 +217,7 @@
def _setup_testing_environment(self):
self._test_env = self._driver._setup_environ_for_test()
- self._test_env["TEST_WEBKIT_API_WEBKIT2_RESOURCES_PATH"] = common.top_level_path("Tools", "TestWebKitAPI", "Tests", "WebKit2")
+ self._test_env["TEST_WEBKIT_API_WEBKIT2_RESOURCES_PATH"] = common.top_level_path("Tools", "TestWebKitAPI", "Tests", "WebKit")
self._test_env["TEST_WEBKIT_API_WEBKIT2_INJECTED_BUNDLE_PATH"] = common.library_build_path()
self._test_env["WEBKIT_EXEC_PATH"] = self._programs_path
Modified: trunk/Tools/TestWebKitAPI/glib/WebKitGLib/TestMain.h (221294 => 221295)
--- trunk/Tools/TestWebKitAPI/glib/WebKitGLib/TestMain.h 2017-08-29 11:30:49 UTC (rev 221294)
+++ trunk/Tools/TestWebKitAPI/glib/WebKitGLib/TestMain.h 2017-08-29 14:01:47 UTC (rev 221295)
@@ -167,7 +167,7 @@
return resourcesDir.get();
}
case WebKit2Resources: {
- GUniquePtr<char> resourcesDir(g_build_filename(WEBKIT_SRC_DIR, "Tools", "TestWebKitAPI", "Tests", "WebKit2", nullptr));
+ GUniquePtr<char> resourcesDir(g_build_filename(WEBKIT_SRC_DIR, "Tools", "TestWebKitAPI", "Tests", "WebKit", nullptr));
return resourcesDir.get();
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
