Reviewers: Michael Starzinger,
Message:
Committed patchset #2 manually as r20728 (presubmit successful).
Description:
Don't run tests that rely on compaction when compaction is turned off.
BUG=
[email protected]
Committed: https://code.google.com/p/v8/source/detail?r=20728
Please review this at https://codereview.chromium.org/236203010/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+9, -0 lines):
M test/cctest/test-api.cc
M test/cctest/test-heap.cc
M test/cctest/test-weakmaps.cc
M test/cctest/test-weaksets.cc
Index: test/cctest/test-api.cc
diff --git a/test/cctest/test-api.cc b/test/cctest/test-api.cc
index
78ecc36d6ad6eec74e4e0da1dbbcd0821388aa14..1da3cd53f50ca86ab27cbc4eac8a18f9875205ba
100644
--- a/test/cctest/test-api.cc
+++ b/test/cctest/test-api.cc
@@ -14182,6 +14182,7 @@ static void event_handler(const v8::JitCodeEvent*
event) {
UNINITIALIZED_TEST(SetJitCodeEventHandler) {
i::FLAG_stress_compaction = true;
i::FLAG_incremental_marking = false;
+ if (i::FLAG_never_compact) return;
const char* script =
"function bar() {"
" var sum = 0;"
Index: test/cctest/test-heap.cc
diff --git a/test/cctest/test-heap.cc b/test/cctest/test-heap.cc
index
1a6e632f44b461142c1c7024a3cf6d61f2c2121b..eec5264eb8c4b9c46c600d9f617087eeb8cbbd69
100644
--- a/test/cctest/test-heap.cc
+++ b/test/cctest/test-heap.cc
@@ -2017,6 +2017,7 @@ TEST(InstanceOfStubWriteBarrier) {
TEST(PrototypeTransitionClearing) {
+ if (FLAG_never_compact) return;
CcTest::InitializeVM();
Isolate* isolate = CcTest::i_isolate();
Factory* factory = isolate->factory();
@@ -2891,6 +2892,7 @@ TEST(Regress2143b) {
TEST(ReleaseOverReservedPages) {
+ if (FLAG_never_compact) return;
i::FLAG_trace_gc = true;
// The optimizer can allocate stuff, messing up the test.
i::FLAG_crankshaft = false;
@@ -3554,6 +3556,7 @@ TEST(Regress169928) {
TEST(Regress168801) {
+ if (i::FLAG_never_compact) return;
i::FLAG_always_compact = true;
i::FLAG_cache_optimized_code = false;
i::FLAG_allow_natives_syntax = true;
@@ -3610,6 +3613,7 @@ TEST(Regress168801) {
TEST(Regress173458) {
+ if (i::FLAG_never_compact) return;
i::FLAG_always_compact = true;
i::FLAG_cache_optimized_code = false;
i::FLAG_allow_natives_syntax = true;
Index: test/cctest/test-weakmaps.cc
diff --git a/test/cctest/test-weakmaps.cc b/test/cctest/test-weakmaps.cc
index
97eca86f1b8da6e59e6725b072a445563239d98a..61f6bf8a4c018711b46e666f5a42e9ccd77ca630
100644
--- a/test/cctest/test-weakmaps.cc
+++ b/test/cctest/test-weakmaps.cc
@@ -180,6 +180,7 @@ TEST(Shrinking) {
// Test that weak map values on an evacuation candidate which are not
reachable
// by other paths are correctly recorded in the slots buffer.
TEST(Regress2060a) {
+ if (i::FLAG_never_compact) return;
FLAG_always_compact = true;
LocalContext context;
Isolate* isolate = GetIsolateFrom(&context);
@@ -215,6 +216,7 @@ TEST(Regress2060a) {
// Test that weak map keys on an evacuation candidate which are reachable
by
// other strong paths are correctly recorded in the slots buffer.
TEST(Regress2060b) {
+ if (i::FLAG_never_compact) return;
FLAG_always_compact = true;
#ifdef VERIFY_HEAP
FLAG_verify_heap = true;
Index: test/cctest/test-weaksets.cc
diff --git a/test/cctest/test-weaksets.cc b/test/cctest/test-weaksets.cc
index
514b6b2393c9d25d827a5690a384f970798cbbf3..c8f3bbf142bf38c07027cd5fa252d4b19488381a
100644
--- a/test/cctest/test-weaksets.cc
+++ b/test/cctest/test-weaksets.cc
@@ -180,6 +180,7 @@ TEST(WeakSet_Shrinking) {
// Test that weak set values on an evacuation candidate which are not
reachable
// by other paths are correctly recorded in the slots buffer.
TEST(WeakSet_Regress2060a) {
+ if (i::FLAG_never_compact) return;
FLAG_always_compact = true;
LocalContext context;
Isolate* isolate = GetIsolateFrom(&context);
@@ -215,6 +216,7 @@ TEST(WeakSet_Regress2060a) {
// Test that weak set keys on an evacuation candidate which are reachable
by
// other strong paths are correctly recorded in the slots buffer.
TEST(WeakSet_Regress2060b) {
+ if (i::FLAG_never_compact) return;
FLAG_always_compact = true;
#ifdef VERIFY_HEAP
FLAG_verify_heap = true;
--
--
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.
