Web Inspector: LayoutTests/inspector tests fail in Production builds due to missing...

https://bugs.webkit.org/show_bug.cgi?id=138898

Reviewed by Mark Rowe.

Source/WebInspectorUI:

In Production builds, if FORCE_TOOL_INSTALL=YES is in the environment
we will copy all resources (for Tests) and still do the combine and
optimize phase for normal Production inspection resources.

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

LayoutTests:

* platform/mac/TestExpectations:

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index aabd1d3..475a55c 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2014-12-04  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: LayoutTests/inspector tests fail in Production builds due to missing test resources
+        https://bugs.webkit.org/show_bug.cgi?id=138898
+
+        Reviewed by Mark Rowe.
+
+        * platform/mac/TestExpectations:
+
 2014-12-04  Eva Balazsfalvi  <evab.u-szeged@partner.samsung.com>
 
         [EFL][WebGL] Remove junk webgl layout tests from TestExpectations

diff --git a/LayoutTests/platform/mac/TestExpectations b/LayoutTests/platform/mac/TestExpectations
index 0d41427..5f93982 100644 (file)
--- a/LayoutTests/platform/mac/TestExpectations
+++ b/LayoutTests/platform/mac/TestExpectations
@@ -1413,19 +1413,17 @@ webkit.org/b/136109 [ Yosemite+ ] fast/multicol/mixed-opacity-fixed-test.html  [
 # FIXME: Needs bugzilla (<rdar://problem/18273139>)
 [ Yosemite+ ] storage/websql/sql-error-codes.html [ Failure ]
 
-# Some inspector tests fail when run from Production builds due to missing test resources.
-# FIXME: Needs bugzilla (<rdar://problem/16200275>)
 # Also, these tests are flaky in Debug/Release builds, <https://bugs.webkit.org/show_bug.cgi?id=138636>
 # and <https://bugs.webkit.org/show_bug.cgi?id=129817>.
-[ Yosemite+ ] inspector/css/matched-style-properties.html [ Pass Failure Crash ]
-[ Yosemite+ ] inspector/css/pseudo-element-matches.html [ Pass Failure Crash ]
-[ Yosemite+ ] inspector/css/selector-specificity.html [ Pass Failure Crash ]
+[ Yosemite+ ] inspector/css/matched-style-properties.html [ Pass Failure ]
+[ Yosemite+ ] inspector/css/pseudo-element-matches.html [ Pass Failure ]
+[ Yosemite+ ] inspector/css/selector-specificity.html [ Pass Failure ]
 [ Yosemite+ ] inspector/dom/content-flow-content-removal.html [ Skip ]
 [ Yosemite+ ] inspector/dom/content-flow-list.html [ Skip ]
-[ Yosemite+ ] inspector/event-listener-set.html [ Pass Failure Crash ]
-[ Yosemite+ ] inspector/event-listener.html [ Pass Failure Crash ]
-[ Yosemite+ ] inspector/model/parse-script-syntax-tree.html [ Pass Failure Crash ]
-[ Yosemite+ ] inspector/protocol-promise-result.html [ Pass Failure Crash ]
+[ Yosemite+ ] inspector/event-listener-set.html [ Pass Failure ]
+[ Yosemite+ ] inspector/event-listener.html [ Pass Failure ]
+[ Yosemite+ ] inspector/model/parse-script-syntax-tree.html [ Pass Failure ]
+[ Yosemite+ ] inspector/protocol-promise-result.html [ Pass Failure ]
 [ Yosemite+ ] inspector/test-harness-trivially-works.html [ Skip ]
 
 # Specific to Yosemite's font fallback

diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
index e5c151a..37c2a68 100644 (file)
--- a/Source/WebInspectorUI/ChangeLog
+++ b/Source/WebInspectorUI/ChangeLog
@@ -1,3 +1,16 @@
+2014-12-04  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: LayoutTests/inspector tests fail in Production builds due to missing test resources
+        https://bugs.webkit.org/show_bug.cgi?id=138898
+
+        Reviewed by Mark Rowe.
+
+        In Production builds, if FORCE_TOOL_INSTALL=YES is in the environment
+        we will copy all resources (for Tests) and still do the combine and
+        optimize phase for normal Production inspection resources.
+
+        * Scripts/copy-user-interface-resources.pl:
+
 2014-12-03  Joseph Pecoraro  <pecoraro@apple.com>
 
         Web Inspector: Missing getter, clients never see DragToAdjustController is enabled

diff --git a/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl b/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl
index f1f614d..8858bbd 100755 (executable)
--- a/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl
+++ b/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl
@@ -111,6 +111,13 @@ make_path($protocolDir, $targetResourcePath);
 # Copy over dynamically loaded files from other frameworks, even if we aren't combining resources.
 copy(File::Spec->catfile($ENV{'JAVASCRIPTCORE_PRIVATE_HEADERS_DIR'}, 'InspectorBackendCommands.js'), File::Spec->catfile($protocolDir, 'InspectorBackendCommands.js')) or die "Copy of InspectorBackendCommands.js failed: $!";
 
+if (defined $ENV{'FORCE_TOOL_INSTALL'} && ($ENV{'FORCE_TOOL_INSTALL'} eq 'YES')) {
+    # Copy all files over individually to ensure we have Test.html / Test.js and files included from Test.html.
+    # We may then proceed to include combined & optimized resources which will output mostly to different paths
+    # but overwrite Main.html / Main.js with optimized versions.
+    ditto($uiRoot, $targetResourcePath);
+}
+
 if (defined $ENV{'COMBINE_INSPECTOR_RESOURCES'} && ($ENV{'COMBINE_INSPECTOR_RESOURCES'} eq 'YES')) {
     my $combineResourcesCmd = File::Spec->catfile($scriptsRoot, 'combine-resources.pl');