[webkit-changes] [227062] trunk/Tools

Wed, 17 Jan 2018 03:16:44 -0800

Title: [227062] trunk/Tools
Revision
227062
Author
[email protected]
Date
2018-01-17 03:16:10 -0800 (Wed, 17 Jan 2018)

Log Message

[GTK][WPE] Use the same subtest names in GTK and WPE unit tests
https://bugs.webkit.org/show_bug.cgi?id=181724

Reviewed by Philippe Normand.

We currently use /webkit2/foo/bar for GTK and /wpe/foo/bar for WPE. Many of the tests are common, so there's no
reason to use different names. This way we can refer to the same test names for both and we can share the
expectations in the TestExpectations.json file.

* TestWebKitAPI/glib/TestExpectations.json:
* TestWebKitAPI/glib/WebKitGLib/TestMain.h: Use /webkit/foo/bar in GTK and WPE.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (227061 => 227062)


--- trunk/Tools/ChangeLog	2018-01-17 11:10:39 UTC (rev 227061)
+++ trunk/Tools/ChangeLog	2018-01-17 11:16:10 UTC (rev 227062)
@@ -1,5 +1,19 @@
 2018-01-17  Carlos Garcia Campos  <[email protected]>
 
+        [GTK][WPE] Use the same subtest names in GTK and WPE unit tests
+        https://bugs.webkit.org/show_bug.cgi?id=181724
+
+        Reviewed by Philippe Normand.
+
+        We currently use /webkit2/foo/bar for GTK and /wpe/foo/bar for WPE. Many of the tests are common, so there's no
+        reason to use different names. This way we can refer to the same test names for both and we can share the
+        expectations in the TestExpectations.json file.
+
+        * TestWebKitAPI/glib/TestExpectations.json:
+        * TestWebKitAPI/glib/WebKitGLib/TestMain.h: Use /webkit/foo/bar in GTK and WPE.
+
+2018-01-17  Carlos Garcia Campos  <[email protected]>
+
         Unreviewed. Increase the slow timeout of GTK and WPE unit tests.
 
         We are using now a lower default timeout, so multiplying by 5 is no longer enough for some of the WTF

Modified: trunk/Tools/TestWebKitAPI/glib/TestExpectations.json (227061 => 227062)


--- trunk/Tools/TestWebKitAPI/glib/TestExpectations.json	2018-01-17 11:10:39 UTC (rev 227061)
+++ trunk/Tools/TestWebKitAPI/glib/TestExpectations.json	2018-01-17 11:16:10 UTC (rev 227062)
@@ -1,13 +1,13 @@
 {
     "TestUIClient": {
         "subtests": {
-            "/webkit2/WebKitWebView/mouse-target": {
+            "/webkit/WebKitWebView/mouse-target": {
                 "expected": {"gtk": {"status": ["TIMEOUT"], "bug": "webkit.org/b/117689"}}
             },
-            "/webkit2/WebKitWebView/usermedia-permission-requests": {
+            "/webkit/WebKitWebView/usermedia-permission-requests": {
                 "expected": {"gtk": {"status": ["TIMEOUT"], "bug": "webkit.org/b/158257"}}
             },
-            "/webkit2/WebKitWebView/audio-usermedia-permission-request": {
+            "/webkit/WebKitWebView/audio-usermedia-permission-request": {
                 "expected": {"gtk": {"status": ["TIMEOUT"], "bug": "webkit.org/b/158257"}}
             }
         }
@@ -14,7 +14,7 @@
     },
     "TestCookieManager": {
         "subtests": {
-            "/webkit2/WebKitCookieManager/persistent-storage": {
+            "/webkit/WebKitCookieManager/persistent-storage": {
                 "expected": {"gtk": {"status": ["FAIL", "PASS"], "bug": "webkit.org/b/134580"}}
             }
         }
@@ -21,7 +21,7 @@
     },
     "TestPrinting": {
         "subtests": {
-            "/webkit2/WebKitPrintOperation/custom-widget": {
+            "/webkit/WebKitPrintOperation/custom-widget": {
                 "expected": {"gtk": {"status": ["FAIL", "PASS"], "bug": "webkit.org/b/168196"}}
             }
         }
@@ -28,7 +28,7 @@
     },
     "TestWebViewEditor": {
         "subtests": {
-            "/webkit2/WebKitWebView/editable/editable": {
+            "/webkit/WebKitWebView/editable/editable": {
                 "expected": {"gtk@Debug": {"status": ["FAIL"], "bug": "webkit.org/b/134580"}}
             }
         }
@@ -35,7 +35,7 @@
     },
     "TestWebExtensions": {
         "subtests": {
-            "/webkit2/WebKitWebView/install-missing-plugins-permission-request": {
+            "/webkit/WebKitWebView/install-missing-plugins-permission-request": {
                 "expected": {"gtk": {"status": ["TIMEOUT"], "bug": "webkit.org/b/147822"}}
             }
         }
@@ -42,7 +42,7 @@
     },
     "TestWebsiteData": {
         "subtests": {
-            "/webkit2/WebKitWebsiteData/databases": {
+            "/webkit/WebKitWebsiteData/databases": {
                 "expected": {"gtk": {"status": ["FAIL"], "bug": "webkit.org/b/181251"}}
             }
         }

Modified: trunk/Tools/TestWebKitAPI/glib/WebKitGLib/TestMain.h (227061 => 227062)


--- trunk/Tools/TestWebKitAPI/glib/WebKitGLib/TestMain.h	2018-01-17 11:10:39 UTC (rev 227061)
+++ trunk/Tools/TestWebKitAPI/glib/WebKitGLib/TestMain.h	2018-01-17 11:16:10 UTC (rev 227062)
@@ -33,11 +33,7 @@
 #include <wpe/webkit.h>
 #endif
 
-#if PLATFORM(GTK)
-#define TEST_PATH_FORMAT "/webkit2/%s/%s"
-#elif PLATFORM(WPE)
-#define TEST_PATH_FORMAT "/wpe/%s/%s"
-#endif
+#define TEST_PATH_FORMAT "/webkit/%s/%s"
 
 #define MAKE_GLIB_TEST_FIXTURE(ClassName) \
     static void setUp(ClassName* fixture, gconstpointer data) \

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to