diff --git a/test/cctest/heap/test-heap.cc b/test/cctest/heap/test-heap.cc index 3efe91dafd..d9006f927e 100644 --- a/test/cctest/heap/test-heap.cc +++ b/test/cctest/heap/test-heap.cc @@ -5547,7 +5547,7 @@ HEAP_TEST(Regress587004) { } HEAP_TEST(Regress589413) { - if (!FLAG_incremental_marking) return; + if (!FLAG_incremental_marking || FLAG_stress_concurrent_allocation) return; FLAG_stress_compaction = true; FLAG_manual_evacuation_candidates_selection = true; FLAG_parallel_compaction = false; @@ -6670,7 +6670,8 @@ UNINITIALIZED_TEST(OutOfMemory) { UNINITIALIZED_TEST(OutOfMemoryIneffectiveGC) { if (!FLAG_detect_ineffective_gcs_near_heap_limit) return; - if (FLAG_stress_incremental_marking) return; + if (FLAG_stress_incremental_marking || FLAG_stress_concurrent_allocation) + return; #ifdef VERIFY_HEAP if (FLAG_verify_heap) return; #endif diff --git a/test/cctest/test-compiler.cc b/test/cctest/test-compiler.cc index eeb0c5251f..a2c73fb301 100644 --- a/test/cctest/test-compiler.cc +++ b/test/cctest/test-compiler.cc @@ -972,7 +972,8 @@ TEST(DecideToPretenureDuringCompilation) { // compilation. if (!i::FLAG_opt || i::FLAG_always_opt || i::FLAG_minor_mc || i::FLAG_stress_incremental_marking || i::FLAG_optimize_for_size || - i::FLAG_turbo_nci || i::FLAG_turbo_nci_as_midtier) { + i::FLAG_turbo_nci || i::FLAG_turbo_nci_as_midtier || + i::FLAG_stress_concurrent_allocation) { return; } diff --git a/test/cctest/test-heap-profiler.cc b/test/cctest/test-heap-profiler.cc index 51cfb3c0e9..27c4e54f02 100644 --- a/test/cctest/test-heap-profiler.cc +++ b/test/cctest/test-heap-profiler.cc @@ -3893,7 +3893,8 @@ TEST(SamplingHeapProfilerPretenuredInlineAllocations) { CcTest::InitializeVM(); if (!CcTest::i_isolate()->use_optimizer() || i::FLAG_always_opt) return; if (i::FLAG_gc_global || i::FLAG_stress_compaction || - i::FLAG_stress_incremental_marking) { + i::FLAG_stress_incremental_marking || + i::FLAG_stress_concurrent_allocation) { return; }