Diff
Modified: trunk/LayoutTests/ChangeLog (170600 => 170601)
--- trunk/LayoutTests/ChangeLog 2014-06-30 22:10:56 UTC (rev 170600)
+++ trunk/LayoutTests/ChangeLog 2014-06-30 22:12:17 UTC (rev 170601)
@@ -1,3 +1,13 @@
+2014-06-30 Michael Saboff <msab...@apple.com>
+
+ Add option to run-jsc-stress-testes to filter out tests that use large heaps
+ https://bugs.webkit.org/show_bug.cgi?id=134458
+
+ Reviewed by Filip Pizlo.
+
+ * js/regress/script-tests/lots-of-fields.js: Added //@largeHeap tag to skip when
+ running on a memoryLimited device.
+
2014-06-30 Myles C. Maxfield <mmaxfi...@apple.com>
Tiles on bottom of screen are not always allocated when necessary
Modified: trunk/LayoutTests/js/regress/script-tests/lots-of-fields.js (170600 => 170601)
--- trunk/LayoutTests/js/regress/script-tests/lots-of-fields.js 2014-06-30 22:10:56 UTC (rev 170600)
+++ trunk/LayoutTests/js/regress/script-tests/lots-of-fields.js 2014-06-30 22:12:17 UTC (rev 170601)
@@ -1,3 +1,6 @@
+// This test uses all available memory on some small memory devices.
+//@largeHeap
+
function foo() {
var result = 0;
for (var i = 0; i < 5000; ++i) {
Modified: trunk/Source/_javascript_Core/ChangeLog (170600 => 170601)
--- trunk/Source/_javascript_Core/ChangeLog 2014-06-30 22:10:56 UTC (rev 170600)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-06-30 22:12:17 UTC (rev 170601)
@@ -1,3 +1,14 @@
+2014-06-30 Michael Saboff <msab...@apple.com>
+
+ Add option to run-jsc-stress-testes to filter out tests that use large heaps
+ https://bugs.webkit.org/show_bug.cgi?id=134458
+
+ Reviewed by Filip Pizlo.
+
+ Added test to skip js1_5/Regress/regress-159334.js when testing on a memory limited device.
+
+ * tests/mozilla/mozilla-tests.yaml:
+
2014-06-30 Daniel Bates <daba...@apple.com>
Avoid copying closed variables vector; actually use move semantics
Modified: trunk/Source/_javascript_Core/tests/mozilla/mozilla-tests.yaml (170600 => 170601)
--- trunk/Source/_javascript_Core/tests/mozilla/mozilla-tests.yaml 2014-06-30 22:10:56 UTC (rev 170600)
+++ trunk/Source/_javascript_Core/tests/mozilla/mozilla-tests.yaml 2014-06-30 22:12:17 UTC (rev 170601)
@@ -2113,7 +2113,7 @@
cmd: defaultRunMozillaTest :normal, "../shell.js"
- path: js1_5/Regress/regress-159334.js
cmd: |
- if $architecture !~ /x86/i and $hostOS == "darwin"
+ if ($architecture !~ /x86/i and $hostOS == "darwin") or $memoryLimited
skip
else
defaultRunMozillaTest :normal, "../shell.js"
Modified: trunk/Tools/ChangeLog (170600 => 170601)
--- trunk/Tools/ChangeLog 2014-06-30 22:10:56 UTC (rev 170600)
+++ trunk/Tools/ChangeLog 2014-06-30 22:12:17 UTC (rev 170601)
@@ -1,3 +1,15 @@
+2014-06-30 Michael Saboff <msab...@apple.com>
+
+ Add option to run-jsc-stress-testes to filter out tests that use large heaps
+ https://bugs.webkit.org/show_bug.cgi?id=134458
+
+ Reviewed by Filip Pizlo.
+
+ Added new --memory-limited to filter out tests that have large heap usage.
+ Such tests are either tagged with //@largeHeap or logic is added to their .yaml file.
+
+ * Scripts/run-jsc-stress-tests:
+
2014-06-30 Myles C. Maxfield <mmaxfi...@apple.com>
DRT in iOS sim crashes while loading fonts
Modified: trunk/Tools/Scripts/run-jsc-stress-tests (170600 => 170601)
--- trunk/Tools/Scripts/run-jsc-stress-tests 2014-06-30 22:10:56 UTC (rev 170600)
+++ trunk/Tools/Scripts/run-jsc-stress-tests 2014-06-30 22:12:17 UTC (rev 170601)
@@ -94,6 +94,7 @@
$jscPath = nil
$copy = true
$enableFTL = false
+$memoryLimited = false
$outputDir = Pathname.new("results")
$verbosity = 0
$bundle = nil
@@ -112,6 +113,8 @@
puts "--no-copy Do not copy the _javascript_Core build product before testing."
puts " --jsc specifies an already present _javascript_Core to test."
puts "--ftl-jit Indicate that we have the FTL JIT."
+ puts "--memory-limited Indicate that we are targeting the test for a memory limited device."
+ puts " Skip tests tagged with //@large-heap"
puts "--output-dir (-o) Path where to put results. Default is #{$outputDir}."
puts "--verbose (-v) Print more things while running."
puts "--run-bundle Runs a bundle previously created by run-jsc-stress-tests."
@@ -130,6 +133,7 @@
['--jsc', '-j', GetoptLong::REQUIRED_ARGUMENT],
['--no-copy', GetoptLong::NO_ARGUMENT],
['--ftl-jit', GetoptLong::NO_ARGUMENT],
+ ['--memory-limited', GetoptLong::NO_ARGUMENT],
['--output-dir', '-o', GetoptLong::REQUIRED_ARGUMENT],
['--run-bundle', GetoptLong::REQUIRED_ARGUMENT],
['--tarball', GetoptLong::NO_ARGUMENT],
@@ -150,6 +154,8 @@
$outputDir = Pathname.new(arg)
when '--ftl-jit'
$enableFTL = true
+ when '--memory-limited'
+ $memoryLimited = true
when '--verbose'
$verbosity += 1
when '--run-bundle'
@@ -875,6 +881,13 @@
puts "Skipping #{$collectionName}/#{$benchmark}"
end
+def largeHeap
+ if $memoryLimited
+ $didAddRunCommand = true
+ puts "Skipping #{$collectionName}/#{$benchmark}"
+ end
+end
+
def allJSFiles(path)
if path.file?
[path]
