Changeset 224621 in webkit

Timestamp:

Nov 9, 2017 12:12:04 AM (6 years ago)

Author:

commit-queue@webkit.org

Message:

REGRESSION(r224566): [GTK][WPE] Many inspector tests are failing after r224566
​https://bugs.webkit.org/show_bug.cgi?id=179419

Patch by Carlos Garcia Campos <​cgarcia@igalia.com> on 2017-11-09
Reviewed by Carlos Alberto Lopez Perez.

All of them fail with the following error:

Uncaught exception in Inspector page: ReferenceError: Can't find variable: CodeMirror [TestCombined.js:36658:15]

This is because Test.html, even when combined, is trying to load CodeMirror from External/CodeMirror, but
CodeMirror was already combined for Main.html. We need to also combine CodeMirror for Test.html.

• Scripts/copy-user-interface-resources.pl:

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• Scripts/copy-user-interface-resources.pl (modified) (3 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2017-11-09  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        REGRESSION(r224566): [GTK][WPE] Many inspector tests are failing after r224566
+        https://bugs.webkit.org/show_bug.cgi?id=179419
+
+        Reviewed by Carlos Alberto Lopez Perez.
+
+        All of them fail with the following error:
+
+        Uncaught exception in Inspector page: ReferenceError: Can't find variable: CodeMirror [TestCombined.js:36658:15]
+
+        This is because Test.html, even when combined, is trying to load CodeMirror from External/CodeMirror, but
+        CodeMirror was already combined for Main.html. We need to also combine CodeMirror for Test.html.
+
+        * Scripts/copy-user-interface-resources.pl:
+
 2017-11-08  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl

@@ -336 +336 @@
     my $derivedSourcesTestHTML = File::Spec->catfile($derivedSourcesDir, 'Test.html');
     my $derivedSourcesTestJS = File::Spec->catfile($derivedSourcesDir, 'TestCombined.js');
-    # Combine the Esprima JavaScript files for testing into a single file (Esprima.js).
+    # Combine the CodeMirror JavaScript files into single file (TestCodeMirror.js).
+    system($perl, $combineResourcesCmd,
+        '--input-dir', 'External/CodeMirror',
+        '--input-html', $derivedSourcesTestHTML,
+        '--input-html-dir', $uiRoot,
+        '--derived-sources-dir', $derivedSourcesDir,
+        '--output-dir', $derivedSourcesDir,
+        '--output-script-name', 'TestCodeMirror.js');
+
+    # Combine the Esprima JavaScript files for testing into a single file (TestEsprima.js).
     system($perl, $combineResourcesCmd,
         '--input-dir', 'External/Esprima',
@@ -349 +358 @@
     seedFile($targetTestJS, $inspectorLicense);
 
-    # Export the license into Esprima.js.
+    # Export the license into TestCodeMirror.js.
+    my $targetCodeMirrorJS = File::Spec->catfile($targetResourcePath, 'TestCodeMirror.js');
+    seedFile($targetCodeMirrorJS, $codeMirrorLicense);
+
+    # Export the license into TestEsprima.js.
     my $targetEsprimaJS = File::Spec->catfile($targetResourcePath, 'TestEsprima.js');
     seedFile($targetEsprimaJS, $esprimaLicense);
@@ -355 +368 @@
     # Append TestCombined.js to the license that was exported above.
     appendFile($targetTestJS, $derivedSourcesTestJS);
+
+    # Append CodeMirror.js to the license that was exported above.
+    my $derivedSourcesCodeMirrorJS = File::Spec->catfile($derivedSourcesDir, 'TestCodeMirror.js');
+    appendFile($targetCodeMirrorJS, $derivedSourcesCodeMirrorJS);
 
     # Append Esprima.js to the license that was exported above.