Revision: 21149
Author:   [email protected]
Date:     Mon May  5 16:48:33 2014 UTC
Log:      Set max new space size in tests to proper MB value.

Revert "Limit old space size in test which require a large new space."

This reverts commit r21103.

Revert "Remove max space limits in tests."

This reverts commit r21104.

BUG=
[email protected]

Review URL: https://codereview.chromium.org/263103006
http://code.google.com/p/v8/source/detail?r=21149

Modified:
 /branches/bleeding_edge/test/cctest/test-api.cc
 /branches/bleeding_edge/test/cctest/test-heap.cc
 /branches/bleeding_edge/test/cctest/test-strings.cc
 /branches/bleeding_edge/test/mjsunit/binary-op-newspace.js
 /branches/bleeding_edge/test/mjsunit/compiler/math-floor-global.js
 /branches/bleeding_edge/test/mjsunit/compiler/math-floor-local.js
 /branches/bleeding_edge/test/mjsunit/define-property-gc.js
 /branches/bleeding_edge/test/mjsunit/math-abs.js
 /branches/bleeding_edge/test/mjsunit/math-floor-part1.js
 /branches/bleeding_edge/test/mjsunit/math-floor-part2.js
 /branches/bleeding_edge/test/mjsunit/math-floor-part3.js
 /branches/bleeding_edge/test/mjsunit/math-floor-part4.js
 /branches/bleeding_edge/test/mjsunit/regress/regress-1708.js
 /branches/bleeding_edge/test/mjsunit/regress/regress-99167.js
 /branches/bleeding_edge/test/mjsunit/regress/regress-create-exception.js

=======================================
--- /branches/bleeding_edge/test/cctest/test-api.cc Fri May 2 19:30:54 2014 UTC +++ /branches/bleeding_edge/test/cctest/test-api.cc Mon May 5 16:48:33 2014 UTC
@@ -19517,7 +19517,7 @@
       case SetResourceConstraints: {
         static const int K = 1024;
         v8::ResourceConstraints constraints;
-        constraints.set_max_new_space_size(256 * K);
+        constraints.set_max_new_space_size(2 * K * K);
         constraints.set_max_old_space_size(4 * K * K);
         v8::SetResourceConstraints(CcTest::isolate(), &constraints);
         break;
=======================================
--- /branches/bleeding_edge/test/cctest/test-heap.cc Wed Apr 30 12:25:18 2014 UTC +++ /branches/bleeding_edge/test/cctest/test-heap.cc Mon May 5 16:48:33 2014 UTC
@@ -2208,7 +2208,7 @@

 TEST(OptimizedPretenuringAllocationFolding) {
   i::FLAG_allow_natives_syntax = true;
-  i::FLAG_max_new_space_size = 2048;
+  i::FLAG_max_new_space_size = 2;
   i::FLAG_allocation_site_pretenuring = false;
   CcTest::InitializeVM();
   if (!CcTest::i_isolate()->use_crankshaft() || i::FLAG_always_opt) return;
@@ -2251,7 +2251,7 @@

 TEST(OptimizedPretenuringAllocationFoldingBlocks) {
   i::FLAG_allow_natives_syntax = true;
-  i::FLAG_max_new_space_size = 2048;
+  i::FLAG_max_new_space_size = 2;
   i::FLAG_allocation_site_pretenuring = false;
   CcTest::InitializeVM();
   if (!CcTest::i_isolate()->use_crankshaft() || i::FLAG_always_opt) return;
@@ -2294,7 +2294,7 @@

 TEST(OptimizedPretenuringObjectArrayLiterals) {
   i::FLAG_allow_natives_syntax = true;
-  i::FLAG_max_new_space_size = 2048;
+  i::FLAG_max_new_space_size = 2;
   CcTest::InitializeVM();
   if (!CcTest::i_isolate()->use_crankshaft() || i::FLAG_always_opt) return;
   if (i::FLAG_gc_global || i::FLAG_stress_compaction) return;
@@ -2323,7 +2323,7 @@

 TEST(OptimizedPretenuringMixedInObjectProperties) {
   i::FLAG_allow_natives_syntax = true;
-  i::FLAG_max_new_space_size = 2048;
+  i::FLAG_max_new_space_size = 2;
   CcTest::InitializeVM();
   if (!CcTest::i_isolate()->use_crankshaft() || i::FLAG_always_opt) return;
   if (i::FLAG_gc_global || i::FLAG_stress_compaction) return;
@@ -2358,7 +2358,7 @@

 TEST(OptimizedPretenuringDoubleArrayProperties) {
   i::FLAG_allow_natives_syntax = true;
-  i::FLAG_max_new_space_size = 2048;
+  i::FLAG_max_new_space_size = 2;
   CcTest::InitializeVM();
   if (!CcTest::i_isolate()->use_crankshaft() || i::FLAG_always_opt) return;
   if (i::FLAG_gc_global || i::FLAG_stress_compaction) return;
@@ -2387,7 +2387,7 @@

 TEST(OptimizedPretenuringdoubleArrayLiterals) {
   i::FLAG_allow_natives_syntax = true;
-  i::FLAG_max_new_space_size = 2048;
+  i::FLAG_max_new_space_size = 2;
   CcTest::InitializeVM();
   if (!CcTest::i_isolate()->use_crankshaft() || i::FLAG_always_opt) return;
   if (i::FLAG_gc_global || i::FLAG_stress_compaction) return;
@@ -2416,7 +2416,7 @@

 TEST(OptimizedPretenuringNestedMixedArrayLiterals) {
   i::FLAG_allow_natives_syntax = true;
-  i::FLAG_max_new_space_size = 2048;
+  i::FLAG_max_new_space_size = 2;
   CcTest::InitializeVM();
   if (!CcTest::i_isolate()->use_crankshaft() || i::FLAG_always_opt) return;
   if (i::FLAG_gc_global || i::FLAG_stress_compaction) return;
@@ -2454,7 +2454,7 @@

 TEST(OptimizedPretenuringNestedObjectLiterals) {
   i::FLAG_allow_natives_syntax = true;
-  i::FLAG_max_new_space_size = 2048;
+  i::FLAG_max_new_space_size = 2;
   CcTest::InitializeVM();
   if (!CcTest::i_isolate()->use_crankshaft() || i::FLAG_always_opt) return;
   if (i::FLAG_gc_global || i::FLAG_stress_compaction) return;
@@ -2492,7 +2492,7 @@

 TEST(OptimizedPretenuringNestedDoubleLiterals) {
   i::FLAG_allow_natives_syntax = true;
-  i::FLAG_max_new_space_size = 2048;
+  i::FLAG_max_new_space_size = 2;
   CcTest::InitializeVM();
   if (!CcTest::i_isolate()->use_crankshaft() || i::FLAG_always_opt) return;
   if (i::FLAG_gc_global || i::FLAG_stress_compaction) return;
@@ -2538,7 +2538,7 @@
     return;
   }
   i::FLAG_allow_natives_syntax = true;
-  i::FLAG_max_new_space_size = 2048;
+  i::FLAG_max_new_space_size = 2;
   CcTest::InitializeVM();
   if (!CcTest::i_isolate()->use_crankshaft() || i::FLAG_always_opt) return;
   if (i::FLAG_gc_global || i::FLAG_stress_compaction) return;
=======================================
--- /branches/bleeding_edge/test/cctest/test-strings.cc Tue Apr 29 13:18:27 2014 UTC +++ /branches/bleeding_edge/test/cctest/test-strings.cc Mon May 5 16:48:33 2014 UTC
@@ -1203,7 +1203,7 @@
   // Set heap limits.
   static const int K = 1024;
   v8::ResourceConstraints constraints;
-  constraints.set_max_new_space_size(256 * K);
+  constraints.set_max_new_space_size(2 * K * K);
   constraints.set_max_old_space_size(4 * K * K);
   v8::SetResourceConstraints(CcTest::isolate(), &constraints);

=======================================
--- /branches/bleeding_edge/test/mjsunit/binary-op-newspace.js Wed Apr 30 19:32:47 2014 UTC +++ /branches/bleeding_edge/test/mjsunit/binary-op-newspace.js Mon May 5 16:48:33 2014 UTC
@@ -25,7 +25,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-// Flags: --noopt
+// Flags: --max-new-space-size=2 --noopt

 // Check that a mod where the stub code hits a failure in heap number
 // allocation still works.
=======================================
--- /branches/bleeding_edge/test/mjsunit/compiler/math-floor-global.js Wed Apr 30 19:32:47 2014 UTC +++ /branches/bleeding_edge/test/mjsunit/compiler/math-floor-global.js Mon May 5 16:48:33 2014 UTC
@@ -25,7 +25,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-// Flags: --allow-natives-syntax
+// Flags: --max-new-space-size=2 --allow-natives-syntax

 // Test inlining of Math.floor when assigned to a global.
 var flo = Math.floor;
=======================================
--- /branches/bleeding_edge/test/mjsunit/compiler/math-floor-local.js Wed Apr 30 19:32:47 2014 UTC +++ /branches/bleeding_edge/test/mjsunit/compiler/math-floor-local.js Mon May 5 16:48:33 2014 UTC
@@ -25,7 +25,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-// Flags: --allow-natives-syntax
+// Flags: --max-new-space-size=2 --allow-natives-syntax

 // Test inlining of Math.floor when assigned to a local.
 var test_id = 0;
=======================================
--- /branches/bleeding_edge/test/mjsunit/define-property-gc.js Wed Apr 30 19:32:47 2014 UTC +++ /branches/bleeding_edge/test/mjsunit/define-property-gc.js Mon May 5 16:48:33 2014 UTC
@@ -26,6 +26,7 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 // Tests the handling of GC issues in the defineProperty method.
+// Flags: --max-new-space-size=2

 function Regular() {
   this[0] = 0;
=======================================
--- /branches/bleeding_edge/test/mjsunit/math-abs.js Wed Apr 30 19:32:47 2014 UTC +++ /branches/bleeding_edge/test/mjsunit/math-abs.js Mon May 5 16:48:33 2014 UTC
@@ -25,7 +25,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-// Flags: --allow-natives-syntax
+// Flags: --max-new-space-size=2 --allow-natives-syntax

 function zero() {
   var x = 0.5;
=======================================
--- /branches/bleeding_edge/test/mjsunit/math-floor-part1.js Wed Apr 30 19:32:47 2014 UTC +++ /branches/bleeding_edge/test/mjsunit/math-floor-part1.js Mon May 5 16:48:33 2014 UTC
@@ -25,7 +25,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-// Flags: --allow-natives-syntax
+// Flags: --max-new-space-size=2 --allow-natives-syntax

 var test_id = 0;

=======================================
--- /branches/bleeding_edge/test/mjsunit/math-floor-part2.js Wed Apr 30 19:32:47 2014 UTC +++ /branches/bleeding_edge/test/mjsunit/math-floor-part2.js Mon May 5 16:48:33 2014 UTC
@@ -25,7 +25,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-// Flags: --allow-natives-syntax
+// Flags: --max-new-space-size=2 --allow-natives-syntax

 var test_id = 0;

=======================================
--- /branches/bleeding_edge/test/mjsunit/math-floor-part3.js Wed Apr 30 19:32:47 2014 UTC +++ /branches/bleeding_edge/test/mjsunit/math-floor-part3.js Mon May 5 16:48:33 2014 UTC
@@ -25,7 +25,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-// Flags: --allow-natives-syntax
+// Flags: --max-new-space-size=2 --allow-natives-syntax

 var test_id = 0;

=======================================
--- /branches/bleeding_edge/test/mjsunit/math-floor-part4.js Wed Apr 30 19:32:47 2014 UTC +++ /branches/bleeding_edge/test/mjsunit/math-floor-part4.js Mon May 5 16:48:33 2014 UTC
@@ -25,7 +25,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-// Flags: --allow-natives-syntax
+// Flags: --max-new-space-size=2 --allow-natives-syntax

 var test_id = 0;

=======================================
--- /branches/bleeding_edge/test/mjsunit/regress/regress-1708.js Wed Apr 30 19:32:47 2014 UTC +++ /branches/bleeding_edge/test/mjsunit/regress/regress-1708.js Mon May 5 16:48:33 2014 UTC
@@ -32,7 +32,7 @@
 // sure that concurrent sweeping, which relies on similar assumptions
 // as lazy sweeping works correctly.

-// Flags: --expose-gc --noincremental-marking
+// Flags: --expose-gc --noincremental-marking --max-new-space-size=2

 (function() {
   var head = new Array(1);
=======================================
--- /branches/bleeding_edge/test/mjsunit/regress/regress-99167.js Wed Apr 30 19:32:47 2014 UTC +++ /branches/bleeding_edge/test/mjsunit/regress/regress-99167.js Mon May 5 16:48:33 2014 UTC
@@ -25,7 +25,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-// Flags: --expose-gc
+// Flags: --expose-gc --max-new-space-size=2

 eval("function Node() { this.a = 1; this.a = 3; }");
 new Node;
=======================================
--- /branches/bleeding_edge/test/mjsunit/regress/regress-create-exception.js Wed Apr 30 19:32:47 2014 UTC +++ /branches/bleeding_edge/test/mjsunit/regress/regress-create-exception.js Mon May 5 16:48:33 2014 UTC
@@ -25,6 +25,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+// Flags: --max-new-space-size=2
 "use strict";

 // Check for GC bug constructing exceptions.

--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
--- You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.

Reply via email to