Diff
Modified: trunk/JSTests/ChangeLog (210774 => 210775)
--- trunk/JSTests/ChangeLog 2017-01-15 06:59:46 UTC (rev 210774)
+++ trunk/JSTests/ChangeLog 2017-01-15 07:22:19 UTC (rev 210775)
@@ -1,5 +1,22 @@
2017-01-14 Yusuke Suzuki <utatane....@gmail.com>
+ Annotate large string tests with largeHeap
+ https://bugs.webkit.org/show_bug.cgi?id=167054
+
+ Reviewed by Filip Pizlo.
+
+ * microbenchmarks/dense-set.js:
+ * microbenchmarks/lots-of-fields.js:
+ * stress/joined-strings-should-not-exceed-max-string-length.js:
+ * stress/make-large-string-jit-strcat.js:
+ * stress/make-large-string-jit.js:
+ * stress/make-large-string-strcat.js:
+ * stress/make-large-string.js:
+ * stress/string-joining-long-strings-should-not-crash.js:
+ * stress/string-prototype-replace-should-throw-out-of-memory-error-when-using-too-much-memory.js:
+
+2017-01-14 Yusuke Suzuki <utatane....@gmail.com>
+
Reserve capacity for StringBuilder in unescape
https://bugs.webkit.org/show_bug.cgi?id=167008
Modified: trunk/JSTests/microbenchmarks/dense-set.js (210774 => 210775)
--- trunk/JSTests/microbenchmarks/dense-set.js 2017-01-15 06:59:46 UTC (rev 210774)
+++ trunk/JSTests/microbenchmarks/dense-set.js 2017-01-15 07:22:19 UTC (rev 210775)
@@ -1,4 +1,4 @@
-//@ largeHeap
+//@ skip if $memoryLimited
(function() {
function bench(name, f, arg) {
Modified: trunk/JSTests/microbenchmarks/lots-of-fields.js (210774 => 210775)
--- trunk/JSTests/microbenchmarks/lots-of-fields.js 2017-01-15 06:59:46 UTC (rev 210774)
+++ trunk/JSTests/microbenchmarks/lots-of-fields.js 2017-01-15 07:22:19 UTC (rev 210775)
@@ -1,5 +1,5 @@
// This test uses all available memory on some small memory devices.
-//@largeHeap
+//@ skip if $memoryLimited
function foo() {
var result = 0;
Modified: trunk/JSTests/stress/joined-strings-should-not-exceed-max-string-length.js (210774 => 210775)
--- trunk/JSTests/stress/joined-strings-should-not-exceed-max-string-length.js 2017-01-15 06:59:46 UTC (rev 210774)
+++ trunk/JSTests/stress/joined-strings-should-not-exceed-max-string-length.js 2017-01-15 07:22:19 UTC (rev 210775)
@@ -1,4 +1,4 @@
-//@ largeHeap
+//@ skip if $memoryLimited
//@ runFTLNoCJIT if !$memoryLimited
// This test should not crash or fail any assertions.
Modified: trunk/JSTests/stress/make-large-string-jit-strcat.js (210774 => 210775)
--- trunk/JSTests/stress/make-large-string-jit-strcat.js 2017-01-15 06:59:46 UTC (rev 210774)
+++ trunk/JSTests/stress/make-large-string-jit-strcat.js 2017-01-15 07:22:19 UTC (rev 210775)
@@ -1,3 +1,4 @@
+//@ skip if $memoryLimited
// Like make-large-string-jit.js, but tests MakeRope with three arguments and op_strcat
// in the DFG and FTL JITs.
Modified: trunk/JSTests/stress/make-large-string-jit.js (210774 => 210775)
--- trunk/JSTests/stress/make-large-string-jit.js 2017-01-15 06:59:46 UTC (rev 210774)
+++ trunk/JSTests/stress/make-large-string-jit.js 2017-01-15 07:22:19 UTC (rev 210775)
@@ -1,3 +1,4 @@
+//@ skip if $memoryLimited
// Like make-large-string.js, but tests MakeRope with two arguments in the DFG and FTL JITs.
var s = "s";
Modified: trunk/JSTests/stress/make-large-string-strcat.js (210774 => 210775)
--- trunk/JSTests/stress/make-large-string-strcat.js 2017-01-15 06:59:46 UTC (rev 210774)
+++ trunk/JSTests/stress/make-large-string-strcat.js 2017-01-15 07:22:19 UTC (rev 210775)
@@ -1,3 +1,5 @@
+//@ skip if $memoryLimited
+
var s = "s";
try {
Modified: trunk/JSTests/stress/make-large-string.js (210774 => 210775)
--- trunk/JSTests/stress/make-large-string.js 2017-01-15 06:59:46 UTC (rev 210774)
+++ trunk/JSTests/stress/make-large-string.js 2017-01-15 07:22:19 UTC (rev 210775)
@@ -1,3 +1,5 @@
+//@ skip if $memoryLimited
+
var s = "s";
try {
Modified: trunk/JSTests/stress/string-joining-long-strings-should-not-crash.js (210774 => 210775)
--- trunk/JSTests/stress/string-joining-long-strings-should-not-crash.js 2017-01-15 06:59:46 UTC (rev 210774)
+++ trunk/JSTests/stress/string-joining-long-strings-should-not-crash.js 2017-01-15 07:22:19 UTC (rev 210775)
@@ -1,4 +1,4 @@
-//@ largeHeap
+//@ skip if $memoryLimited
//@ runDefault if !$memoryLimited
// This test should not crash.
Modified: trunk/JSTests/stress/string-prototype-replace-should-throw-out-of-memory-error-when-using-too-much-memory.js (210774 => 210775)
--- trunk/JSTests/stress/string-prototype-replace-should-throw-out-of-memory-error-when-using-too-much-memory.js 2017-01-15 06:59:46 UTC (rev 210774)
+++ trunk/JSTests/stress/string-prototype-replace-should-throw-out-of-memory-error-when-using-too-much-memory.js 2017-01-15 07:22:19 UTC (rev 210775)
@@ -1,4 +1,4 @@
-//@ largeHeap
+//@ skip if $memoryLimited
//@ runFTLNoCJIT("--timeoutMultiplier=1.5") if !$memoryLimited
//@ slow!
// This test should not crash or fail any assertions.
Modified: trunk/LayoutTests/ChangeLog (210774 => 210775)
--- trunk/LayoutTests/ChangeLog 2017-01-15 06:59:46 UTC (rev 210774)
+++ trunk/LayoutTests/ChangeLog 2017-01-15 07:22:19 UTC (rev 210775)
@@ -1,3 +1,14 @@
+2017-01-14 Yusuke Suzuki <utatane....@gmail.com>
+
+ Annotate large string tests with largeHeap
+ https://bugs.webkit.org/show_bug.cgi?id=167054
+
+ Reviewed by Filip Pizlo.
+
+ * js/script-tests/stringimpl-to-jsstring-on-large-strings-1.js:
+ * js/script-tests/stringimpl-to-jsstring-on-large-strings-2.js:
+ * js/script-tests/stringimpl-to-jsstring-on-large-strings-3.js:
+
2017-01-14 Chris Dumez <cdu...@apple.com>
Align the innerText setter with the HTML spec and Gecko
Modified: trunk/LayoutTests/js/script-tests/stringimpl-to-jsstring-on-large-strings-1.js (210774 => 210775)
--- trunk/LayoutTests/js/script-tests/stringimpl-to-jsstring-on-large-strings-1.js 2017-01-15 06:59:46 UTC (rev 210774)
+++ trunk/LayoutTests/js/script-tests/stringimpl-to-jsstring-on-large-strings-1.js 2017-01-15 07:22:19 UTC (rev 210775)
@@ -1,4 +1,4 @@
-//@largeHeap
+//@ skip if $memoryLimited
"use strict"
Modified: trunk/LayoutTests/js/script-tests/stringimpl-to-jsstring-on-large-strings-2.js (210774 => 210775)
--- trunk/LayoutTests/js/script-tests/stringimpl-to-jsstring-on-large-strings-2.js 2017-01-15 06:59:46 UTC (rev 210774)
+++ trunk/LayoutTests/js/script-tests/stringimpl-to-jsstring-on-large-strings-2.js 2017-01-15 07:22:19 UTC (rev 210775)
@@ -1,4 +1,4 @@
-//@largeHeap
+//@ skip if $memoryLimited
"use strict"
Modified: trunk/LayoutTests/js/script-tests/stringimpl-to-jsstring-on-large-strings-3.js (210774 => 210775)
--- trunk/LayoutTests/js/script-tests/stringimpl-to-jsstring-on-large-strings-3.js 2017-01-15 06:59:46 UTC (rev 210774)
+++ trunk/LayoutTests/js/script-tests/stringimpl-to-jsstring-on-large-strings-3.js 2017-01-15 07:22:19 UTC (rev 210775)
@@ -1,4 +1,4 @@
-//@largeHeap
+//@ skip if $memoryLimited
"use strict"
Modified: trunk/Tools/ChangeLog (210774 => 210775)
--- trunk/Tools/ChangeLog 2017-01-15 06:59:46 UTC (rev 210774)
+++ trunk/Tools/ChangeLog 2017-01-15 07:22:19 UTC (rev 210775)
@@ -1,3 +1,13 @@
+2017-01-14 Yusuke Suzuki <utatane....@gmail.com>
+
+ Annotate large string tests with largeHeap
+ https://bugs.webkit.org/show_bug.cgi?id=167054
+
+ Reviewed by Filip Pizlo.
+
+ * Scripts/run-_javascript_core-tests:
+ * Scripts/run-jsc-stress-tests:
+
2017-01-14 Joseph Pecoraro <pecor...@apple.com>
Remove stale references to ENABLE_ES6_GENERATORS and ENABLE_PROMISES
Modified: trunk/Tools/Scripts/run-_javascript_core-tests (210774 => 210775)
--- trunk/Tools/Scripts/run-_javascript_core-tests 2017-01-15 06:59:46 UTC (rev 210774)
+++ trunk/Tools/Scripts/run-_javascript_core-tests 2017-01-15 07:22:19 UTC (rev 210775)
@@ -136,7 +136,7 @@
--make-runner Uses the faster make-based runner.
--memory-limited Indicate that we are targeting the test for a memory limited device.
- Skip tests tagged with //\@largeHeap
+ Skip tests tagged with //\@skip if \$memoryLimited
--filter Only run tests whose name matches the given regular _expression_.
--env-vars Pass a list of environment variables to set before running tests.
Modified: trunk/Tools/Scripts/run-jsc-stress-tests (210774 => 210775)
--- trunk/Tools/Scripts/run-jsc-stress-tests 2017-01-15 06:59:46 UTC (rev 210774)
+++ trunk/Tools/Scripts/run-jsc-stress-tests 2017-01-15 07:22:19 UTC (rev 210775)
@@ -127,7 +127,7 @@
puts "--no-copy Do not copy the _javascript_Core build product before testing."
puts " --jsc specifies an already present _javascript_Core to test."
puts "--memory-limited Indicate that we are targeting the test for a memory limited device."
- puts " Skip tests tagged with //@largeHeap"
+ puts " Skip tests tagged with //@skip if $memoryLimited"
puts "--no-jit Do not run JIT specific tests."
puts "--force-collectContinuously Enable the collectContinuously mode even if disabled on this"
puts " platform."
@@ -1489,13 +1489,6 @@
puts "Skipping #{$collectionName}/#{$benchmark}"
end
-def largeHeap
- if $memoryLimited
- $didAddRunCommand = true
- puts "Skipping #{$collectionName}/#{$benchmark}"
- end
-end
-
def allJSFiles(path)
if path.file?
[path]
