REGRESSION(r169092 and r169102): Skip failing JSC tests poperly on non-x86 Darwin...

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

Patch by Eva Balazsfalvi <evab.u-szeged@partner.samsung.com> on 2014-06-03
Reviewed by Csaba Osztrogonác.

PerformanceTests/SunSpider:
* profiler-test.yaml: Skip profiler tests only if the architecture isn't x86 and the host is Darwin.

Source/JavaScriptCore:
* tests/mozilla/mozilla-tests.yaml: Skip js1_5/Regress/regress-159334.js only if the architecture isn't x86 and the host is Darwin.

Tools:
* Scripts/run-jsc-stress-tests: Added determineOS to determine the host operating system the script run on.

LayoutTests:
* js/script-tests/function-apply-many-args.js: Skip it only if the architecture isn't x86 and the host is Darwin.

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 014c17d30d077f193f39fb831593483bb38c86f9..6251f375b182675562a2e2a7762bd29a1f3e7955 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2014-06-03  Eva Balazsfalvi  <evab.u-szeged@partner.samsung.com>
+
+        REGRESSION(r169092 and r169102): Skip failing JSC tests poperly on non-x86 Darwin platforms
+        https://bugs.webkit.org/show_bug.cgi?id=133149
+
+        Reviewed by Csaba Osztrogonác.
+
+        * js/script-tests/function-apply-many-args.js: Skip it only if the architecture isn't x86 and the host is Darwin.
+
 2014-06-02  Jinwoo Song  <jinwoo7.song@samsung.com>
 
         Unreviewed EFL gardening. Rebaseline after r169522.

diff --git a/LayoutTests/js/script-tests/function-apply-many-args.js b/LayoutTests/js/script-tests/function-apply-many-args.js
index 34e206e07ccec4a789590bfd662d7833eabdce9b..f072e8846758feb5c059d721affaabf15542cd10 100644 (file)
--- a/LayoutTests/js/script-tests/function-apply-many-args.js
+++ b/LayoutTests/js/script-tests/function-apply-many-args.js
@@ -1,4 +1,4 @@
-//@ skip if $architecture !~ /x86/i
+//@ skip if $architecture !~ /x86/i and $hostOS == "darwin"
 
 description("Tests that we throw an error when passing a number of arguments beyond a certain threshold.");
 

diff --git a/PerformanceTests/SunSpider/ChangeLog b/PerformanceTests/SunSpider/ChangeLog
index 79754ffb6e2c8fca29e8737410094f3dba31a178..32dd4c99a94c823dbd1017808d02e1d6271b59d1 100644 (file)
--- a/PerformanceTests/SunSpider/ChangeLog
+++ b/PerformanceTests/SunSpider/ChangeLog
@@ -1,3 +1,12 @@
+2014-06-03  Eva Balazsfalvi  <evab.u-szeged@partner.samsung.com>
+
+        REGRESSION(r169092 and r169102): Skip failing JSC tests poperly on non-x86 Darwin platforms
+        https://bugs.webkit.org/show_bug.cgi?id=133149
+
+        Reviewed by Csaba Osztrogonác.
+
+        * profiler-test.yaml: Skip profiler tests only if the architecture isn't x86 and the host is Darwin.
+
 2014-05-21  Filip Pizlo  <fpizlo@apple.com>
 
         Unreviewed, roll out http://trac.webkit.org/changeset/169159.

diff --git a/PerformanceTests/SunSpider/profiler-test.yaml b/PerformanceTests/SunSpider/profiler-test.yaml
index b5d269d8ecad89ae87fd579d06a81864f86e0d7c..88895ff16f86ff92f0225118c1bcc91881b2401c 100644 (file)
--- a/PerformanceTests/SunSpider/profiler-test.yaml
+++ b/PerformanceTests/SunSpider/profiler-test.yaml
@@ -26,8 +26,8 @@
 
 - path: tests/sunspider-1.0
   cmd: |
-      if $architecture =~ /x86/
-          runProfiler
-      else
+      if $architecture !~ /x86/i and $hostOS == "darwin"
           skip
+      else
+          runProfiler
       end

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 80ff83bb31dfd51e2cd45edca22f12725c77b178..4cb789ee18f36c7f9c821acf5359337eefbc7588 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2014-06-03  Eva Balazsfalvi  <evab.u-szeged@partner.samsung.com>
+
+        REGRESSION(r169092 and r169102): Skip failing JSC tests poperly on non-x86 Darwin platforms
+        https://bugs.webkit.org/show_bug.cgi?id=133149
+
+        Reviewed by Csaba Osztrogonác.
+
+        * tests/mozilla/mozilla-tests.yaml: Skip js1_5/Regress/regress-159334.js only if the architecture isn't x86 and the host is Darwin.
+
 2014-05-31  Anders Carlsson  <andersca@apple.com>
 
         Add a LazyNeverDestroyed class template and use it

diff --git a/Source/JavaScriptCore/tests/mozilla/mozilla-tests.yaml b/Source/JavaScriptCore/tests/mozilla/mozilla-tests.yaml
index 5675ca44c0ab4f0613d0ec7b2c48a47ab8c88221..a2da4c49bff51feee99e5ee81b7368fe871540f1 100644 (file)
--- a/Source/JavaScriptCore/tests/mozilla/mozilla-tests.yaml
+++ b/Source/JavaScriptCore/tests/mozilla/mozilla-tests.yaml
@@ -2113,10 +2113,10 @@
   cmd: defaultRunMozillaTest :normal, "../shell.js"
 - path: js1_5/Regress/regress-159334.js
   cmd: |
-      if $architecture =~ /x86/i
-          defaultRunMozillaTest :normal, "../shell.js"
-      else
+      if $architecture !~ /x86/i and $hostOS == "darwin"
           skip
+      else
+          defaultRunMozillaTest :normal, "../shell.js"
       end
 - path: js1_5/Regress/regress-168347.js
   cmd: defaultRunMozillaTest :normal, "../shell.js"

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index c7c811f584c874f9ff7c33c4d89d3f6a69e2b277..a42c5c1efb690def01d735332243d6522a751776 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,12 @@
+2014-06-03  Eva Balazsfalvi  <evab.u-szeged@partner.samsung.com>
+
+        REGRESSION(r169092 and r169102): Skip failing JSC tests poperly on non-x86 Darwin platforms
+        https://bugs.webkit.org/show_bug.cgi?id=133149
+
+        Reviewed by Csaba Osztrogonác.
+
+        * Scripts/run-jsc-stress-tests: Added determineOS to determine the host operating system the script run on.
+
 2014-06-02  Tibor Meszaros  <tmeszaros.u-szeged@partner.samsung.com>
 
         Add a verbose flag to binding tests

diff --git a/Tools/Scripts/run-jsc-stress-tests b/Tools/Scripts/run-jsc-stress-tests
index c13f95c40553c52aa701724dd91615408d733026..387c7b5c10b799b984fcff278889e9ec937b494e 100755 (executable)
--- a/Tools/Scripts/run-jsc-stress-tests
+++ b/Tools/Scripts/run-jsc-stress-tests
@@ -26,6 +26,7 @@
 require 'fileutils'
 require 'getoptlong'
 require 'pathname'
+require 'rbconfig'
 require 'uri'
 require 'yaml'
 
@@ -228,7 +229,22 @@ def determineArchitecture
     end
 end
 
+def determineOS
+    case RbConfig::CONFIG["host_os"]
+    when /darwin/i
+        "darwin"
+    when /linux/i
+        "linux"
+    when /mswin|mingw|cygwin/
+        "windows"
+    else
+        $stderr.puts "Warning: unable to determine host operating system"
+        nil
+    end
+end
+
 $architecture = determineArchitecture
+$hostOS = determineOS
 
 $numFailures = 0