REGRESSION(r224566): [GTK] 26 new timeouts on inspector related tests.
authorcarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 13 Nov 2017 07:41:18 +0000 (07:41 +0000)
committercarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 13 Nov 2017 07:41:18 +0000 (07:41 +0000)
https://bugs.webkit.org/show_bug.cgi?id=179471

Reviewed by Darin Adler.

Source/WebInspectorUI:

TestStub.html and TestStub.js was missing in resources bundle.

* Scripts/copy-user-interface-resources.pl: Also combine resources for TestStub.

LayoutTests:

Unskip tests that are passing now.

* platform/gtk/TestExpectations:

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

LayoutTests/ChangeLog
LayoutTests/platform/gtk/TestExpectations
Source/WebInspectorUI/ChangeLog
Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl

index 7a44a29..914adff 100644 (file)
@@ -1,3 +1,14 @@
+2017-11-12  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        REGRESSION(r224566): [GTK] 26 new timeouts on inspector related tests.
+        https://bugs.webkit.org/show_bug.cgi?id=179471
+
+        Reviewed by Darin Adler.
+
+        Unskip tests that are passing now.
+
+        * platform/gtk/TestExpectations:
+
 2017-11-12  Yusuke Suzuki  <utatane.tea@gmail.com>
 
         [WebCore] Implement import.meta.url
index 57bac38..f4ab788 100644 (file)
@@ -2201,33 +2201,6 @@ webkit.org/b/178454 editing/pasteboard/datatransfer-items-paste-plaintext.html [
 
 webkit.org/b/178792 fast/events/touch/touch-inside-iframe.html [ Timeout ]
 
-webkit.org/b/179471 inspector/console/console-message.html [ Timeout ]
-webkit.org/b/179471 inspector/console/console-time.html [ Timeout ]
-webkit.org/b/179471 inspector/console/heapSnapshot.html [ Timeout ]
-webkit.org/b/179471 inspector/console/js-source-locations.html [ Timeout ]
-webkit.org/b/179471 inspector/console/x-frame-options-message.html [ Timeout ]
-webkit.org/b/179471 inspector/heap/tracking.html [ Timeout ]
-webkit.org/b/179471 inspector/layers/layers-anonymous.html [ Timeout ]
-webkit.org/b/179471 inspector/layers/layers-compositing-reasons.html [ Timeout ]
-webkit.org/b/179471 inspector/layers/layers-for-node.html [ Timeout ]
-webkit.org/b/179471 inspector/layers/layers-generated-content.html [ Timeout ]
-webkit.org/b/179471 inspector/layers/layers-reflected-content.html [ Timeout ]
-webkit.org/b/179471 inspector/memory/tracking.html [ Timeout ]
-webkit.org/b/179471 inspector/page/media-query-list-listener-exception.html [ Timeout ]
-webkit.org/b/179471 inspector/protocol/backend-dispatcher-argument-errors.html [ Timeout ]
-webkit.org/b/179471 inspector/protocol/backend-dispatcher-malformed-message-errors.html [ Timeout ]
-webkit.org/b/179471 inspector/runtime/CommandLineAPI-inspect.html [ Timeout ]
-webkit.org/b/179471 inspector/script-profiler/event-type-API.html [ Timeout ]
-webkit.org/b/179471 inspector/script-profiler/event-type-Microtask.html [ Timeout ]
-webkit.org/b/179471 inspector/script-profiler/event-type-Other.html [ Timeout ]
-webkit.org/b/179471 inspector/script-profiler/tracking.html [ Timeout ]
-webkit.org/b/179471 inspector/unit-tests/async-test-suite.html [ Timeout ]
-webkit.org/b/179471 inspector/unit-tests/protocol-test-dispatch-event-to-frontend.html [ Timeout ]
-webkit.org/b/179471 inspector/unit-tests/sync-test-suite.html [ Timeout ]
-webkit.org/b/179471 inspector/worker/worker-create-and-terminate.html [ Timeout ]
-webkit.org/b/179471 inspector/worker/worker-recover-if-inspector-close.html [ Timeout ]
-webkit.org/b/179471 inspector/unit-tests/breakpoint-log-message-lexer.html [ Timeout ]
-
 #////////////////////////////////////////////////////////////////////////////////////////
 # End of Tests timing out
 #////////////////////////////////////////////////////////////////////////////////////////
index b50d292..ab82744 100644 (file)
@@ -1,3 +1,14 @@
+2017-11-12  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        REGRESSION(r224566): [GTK] 26 new timeouts on inspector related tests.
+        https://bugs.webkit.org/show_bug.cgi?id=179471
+
+        Reviewed by Darin Adler.
+
+        TestStub.html and TestStub.js was missing in resources bundle.
+
+        * Scripts/copy-user-interface-resources.pl: Also combine resources for TestStub.
+
 2017-11-11  Joseph Pecoraro  <pecoraro@apple.com>
 
         Web Inspector: Network detail views - Include a newline between sections when copying
index 7d8871b..bc03720 100755 (executable)
@@ -379,6 +379,17 @@ if ($shouldCombineTest) {
     # Copy over Test.html.
     copy($derivedSourcesTestHTML, File::Spec->catfile($targetResourcePath, 'Test.html'));
 
+    # Combine the JavaScript files for testing into a single file (TestStub.js).
+    system($perl, $combineResourcesCmd,
+        '--input-html', File::Spec->catfile($uiRoot, 'TestStub.html'),
+        '--derived-sources-dir', $derivedSourcesDir,
+        '--output-dir', $derivedSourcesDir,
+        '--output-script-name', 'TestStubCombined.js');
+
+    # Copy over TestStub.html and TestStubCombined.js.
+    copy(File::Spec->catfile($derivedSourcesDir, 'TestStub.html'), File::Spec->catfile($targetResourcePath, 'TestStub.html'));
+    copy(File::Spec->catfile($derivedSourcesDir, 'TestStubCombined.js'), File::Spec->catfile($targetResourcePath, 'TestStubCombined.js'));
+
     # Copy the Legacy directory.
     ditto(File::Spec->catfile($uiRoot, 'Protocol', 'Legacy'), File::Spec->catfile($protocolDir, 'Legacy'));
 }