Commit c1435b08 authored by hpayer@chromium.org's avatar hpayer@chromium.org

Don't run tests that rely on compaction when compaction is turned off.

BUG=
R=mstarzinger@chromium.org

Review URL: https://codereview.chromium.org/236203010

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@20728 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 181bcc34
...@@ -14182,6 +14182,7 @@ static void event_handler(const v8::JitCodeEvent* event) { ...@@ -14182,6 +14182,7 @@ static void event_handler(const v8::JitCodeEvent* event) {
UNINITIALIZED_TEST(SetJitCodeEventHandler) { UNINITIALIZED_TEST(SetJitCodeEventHandler) {
i::FLAG_stress_compaction = true; i::FLAG_stress_compaction = true;
i::FLAG_incremental_marking = false; i::FLAG_incremental_marking = false;
if (i::FLAG_never_compact) return;
const char* script = const char* script =
"function bar() {" "function bar() {"
" var sum = 0;" " var sum = 0;"
......
...@@ -2017,6 +2017,7 @@ TEST(InstanceOfStubWriteBarrier) { ...@@ -2017,6 +2017,7 @@ TEST(InstanceOfStubWriteBarrier) {
TEST(PrototypeTransitionClearing) { TEST(PrototypeTransitionClearing) {
if (FLAG_never_compact) return;
CcTest::InitializeVM(); CcTest::InitializeVM();
Isolate* isolate = CcTest::i_isolate(); Isolate* isolate = CcTest::i_isolate();
Factory* factory = isolate->factory(); Factory* factory = isolate->factory();
...@@ -2891,6 +2892,7 @@ TEST(Regress2143b) { ...@@ -2891,6 +2892,7 @@ TEST(Regress2143b) {
TEST(ReleaseOverReservedPages) { TEST(ReleaseOverReservedPages) {
if (FLAG_never_compact) return;
i::FLAG_trace_gc = true; i::FLAG_trace_gc = true;
// The optimizer can allocate stuff, messing up the test. // The optimizer can allocate stuff, messing up the test.
i::FLAG_crankshaft = false; i::FLAG_crankshaft = false;
...@@ -3554,6 +3556,7 @@ TEST(Regress169928) { ...@@ -3554,6 +3556,7 @@ TEST(Regress169928) {
TEST(Regress168801) { TEST(Regress168801) {
if (i::FLAG_never_compact) return;
i::FLAG_always_compact = true; i::FLAG_always_compact = true;
i::FLAG_cache_optimized_code = false; i::FLAG_cache_optimized_code = false;
i::FLAG_allow_natives_syntax = true; i::FLAG_allow_natives_syntax = true;
...@@ -3610,6 +3613,7 @@ TEST(Regress168801) { ...@@ -3610,6 +3613,7 @@ TEST(Regress168801) {
TEST(Regress173458) { TEST(Regress173458) {
if (i::FLAG_never_compact) return;
i::FLAG_always_compact = true; i::FLAG_always_compact = true;
i::FLAG_cache_optimized_code = false; i::FLAG_cache_optimized_code = false;
i::FLAG_allow_natives_syntax = true; i::FLAG_allow_natives_syntax = true;
......
...@@ -180,6 +180,7 @@ TEST(Shrinking) { ...@@ -180,6 +180,7 @@ TEST(Shrinking) {
// Test that weak map values on an evacuation candidate which are not reachable // Test that weak map values on an evacuation candidate which are not reachable
// by other paths are correctly recorded in the slots buffer. // by other paths are correctly recorded in the slots buffer.
TEST(Regress2060a) { TEST(Regress2060a) {
if (i::FLAG_never_compact) return;
FLAG_always_compact = true; FLAG_always_compact = true;
LocalContext context; LocalContext context;
Isolate* isolate = GetIsolateFrom(&context); Isolate* isolate = GetIsolateFrom(&context);
...@@ -215,6 +216,7 @@ TEST(Regress2060a) { ...@@ -215,6 +216,7 @@ TEST(Regress2060a) {
// Test that weak map keys on an evacuation candidate which are reachable by // Test that weak map keys on an evacuation candidate which are reachable by
// other strong paths are correctly recorded in the slots buffer. // other strong paths are correctly recorded in the slots buffer.
TEST(Regress2060b) { TEST(Regress2060b) {
if (i::FLAG_never_compact) return;
FLAG_always_compact = true; FLAG_always_compact = true;
#ifdef VERIFY_HEAP #ifdef VERIFY_HEAP
FLAG_verify_heap = true; FLAG_verify_heap = true;
......
...@@ -180,6 +180,7 @@ TEST(WeakSet_Shrinking) { ...@@ -180,6 +180,7 @@ TEST(WeakSet_Shrinking) {
// Test that weak set values on an evacuation candidate which are not reachable // Test that weak set values on an evacuation candidate which are not reachable
// by other paths are correctly recorded in the slots buffer. // by other paths are correctly recorded in the slots buffer.
TEST(WeakSet_Regress2060a) { TEST(WeakSet_Regress2060a) {
if (i::FLAG_never_compact) return;
FLAG_always_compact = true; FLAG_always_compact = true;
LocalContext context; LocalContext context;
Isolate* isolate = GetIsolateFrom(&context); Isolate* isolate = GetIsolateFrom(&context);
...@@ -215,6 +216,7 @@ TEST(WeakSet_Regress2060a) { ...@@ -215,6 +216,7 @@ TEST(WeakSet_Regress2060a) {
// Test that weak set keys on an evacuation candidate which are reachable by // Test that weak set keys on an evacuation candidate which are reachable by
// other strong paths are correctly recorded in the slots buffer. // other strong paths are correctly recorded in the slots buffer.
TEST(WeakSet_Regress2060b) { TEST(WeakSet_Regress2060b) {
if (i::FLAG_never_compact) return;
FLAG_always_compact = true; FLAG_always_compact = true;
#ifdef VERIFY_HEAP #ifdef VERIFY_HEAP
FLAG_verify_heap = true; FLAG_verify_heap = true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment