Unreviewed. REGRESSION(r221219): Fix unit tests using resources from WebKit directory.
authorcarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 29 Aug 2017 14:01:47 +0000 (14:01 +0000)
committercarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 29 Aug 2017 14:01:47 +0000 (14:01 +0000)
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):

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

Tools/ChangeLog
Tools/Scripts/run-gtk-tests
Tools/TestWebKitAPI/glib/WebKitGLib/TestMain.h

index eda9fd9..6073ee1 100644 (file)
@@ -1,3 +1,15 @@
+2017-08-29  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        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  <eric.carlson@apple.com>
 
         Logger should use makeString instead of String::format
index a3d3e6f..cdf9516 100755 (executable)
@@ -217,7 +217,7 @@ class TestRunner:
 
     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
 
index d9c2ee1..71643c5 100644 (file)
@@ -167,7 +167,7 @@ public:
             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();
         }
         }