From 2a7a827f68aab818db3c668da38c7ea15be2816c Mon Sep 17 00:00:00 2001 From: Tamer Tas Date: Fri, 14 Dec 2018 13:52:21 +0000 Subject: [PATCH] [tools] skipping the debug mode in status files imply skipping in dcheck_always_on as well R=machenbach@chromium.org CC=yangguo@chromium.org Bug: v8:8491 Change-Id: I8379825c194e588da582a3000201eea75b59140a Reviewed-on: https://chromium-review.googlesource.com/c/1371826 Commit-Queue: Tamer Tas Reviewed-by: Michael Achenbach Cr-Commit-Position: refs/heads/master@{#58243} --- test/cctest/cctest.status | 6 +++--- test/inspector/inspector.status | 2 +- test/mjsunit/mjsunit.status | 14 +++++++------- test/webkit/webkit.status | 4 ++-- tools/testrunner/base_runner.py | 4 +++- 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/test/cctest/cctest.status b/test/cctest/cctest.status index 0ba2839877..e5052e451e 100644 --- a/test/cctest/cctest.status +++ b/test/cctest/cctest.status @@ -157,7 +157,7 @@ 'test-api/Threading*': [SKIP], }], # 'arch == arm64 and simulator_run' -['arch == arm64 and (mode == debug or dcheck_always_on) and simulator_run', { +['arch == arm64 and (mode == debug) and simulator_run', { # Pass but take too long with the simulator in debug mode. 'test-api/ExternalDoubleArray': [SKIP], @@ -167,7 +167,7 @@ 'test-api/Float32Array': [SKIP], 'test-api/Float64Array': [SKIP], 'test-api/Uint8Array': [SKIP], -}], # 'arch == arm64 and (mode == debug or dcheck_always_on) and simulator_run' +}], # 'arch == arm64 and (mode == debug) and simulator_run' ############################################################################## ['variant == nooptimization and (arch == arm or arch == arm64) and simulator_run', { @@ -379,7 +379,7 @@ ############################################################################## ['system != android and arch in [arm, arm64] and not simulator_run', { # Consumes too much memory on ODROIDs in debug mode and optimize_for_size. - 'test-code-generator/FuzzAssemble*': [PASS, ['(mode == debug or dcheck_always_on) and optimize_for_size', SKIP]], + 'test-code-generator/FuzzAssemble*': [PASS, ['(mode == debug) and optimize_for_size', SKIP]], }], # 'system != android and arch in [arm, arm64] and not simulator_run' ############################################################################## diff --git a/test/inspector/inspector.status b/test/inspector/inspector.status index a6e85e9a8c..86b4548835 100644 --- a/test/inspector/inspector.status +++ b/test/inspector/inspector.status @@ -37,7 +37,7 @@ ############################################################################## ['(arch == arm or arch == arm64) and simulator_run', { # Slow tests: https://crbug.com/v8/7783 - 'runtime/console-messages-limits': [PASS, NO_VARIANTS, ['mode == debug or dcheck_always_on', SKIP]], + 'runtime/console-messages-limits': [PASS, NO_VARIANTS, ['mode == debug', SKIP]], }], # (arch == arm or arch == arm64) and simulator_run ############################################################################## diff --git a/test/mjsunit/mjsunit.status b/test/mjsunit/mjsunit.status index a2250b7ec4..439237f382 100644 --- a/test/mjsunit/mjsunit.status +++ b/test/mjsunit/mjsunit.status @@ -107,12 +107,12 @@ ############################################################################## # Skip long running tests that time out in debug mode. - 'generated-transition-stub': [PASS, ['mode == debug or dcheck_always_on', SKIP]], + 'generated-transition-stub': [PASS, ['mode == debug', SKIP]], 'migrations': [SKIP], - 'array-functions-prototype-misc': [PASS, SLOW, ['mode == debug or dcheck_always_on', SKIP]], - 'compiler/regress-808472': [PASS, ['mode == debug or dcheck_always_on', SKIP]], + 'array-functions-prototype-misc': [PASS, SLOW, ['mode == debug', SKIP]], + 'compiler/regress-808472': [PASS, ['mode == debug', SKIP]], 'es6/promise-all-overflow-1': [SKIP], - 'es6/promise-all-overflow-2': [PASS, SLOW, ['mode == debug or dcheck_always_on or arch != x64', SKIP]], + 'es6/promise-all-overflow-2': [PASS, SLOW, ['mode == debug or arch != x64', SKIP]], ############################################################################## # This test sets the umask on a per-process basis and hence cannot be @@ -140,7 +140,7 @@ ############################################################################## # Tests verifying CHECK and ASSERT. 'verify-check-false': [FAIL, NO_VARIANTS], - 'verify-assert-false': [NO_VARIANTS, ['mode == release and dcheck_always_on == False', PASS], ['mode == debug or dcheck_always_on == True', FAIL]], + 'verify-assert-false': [NO_VARIANTS, ['mode == release and dcheck_always_on == False', PASS], ['mode == debug', FAIL]], ############################################################################## # Tests with different versions for release and debug. @@ -214,10 +214,10 @@ # TODO(vogelheim): big-object-literal exceeds the stack in debug builds, # which makes the test useless. - 'big-object-literal': [PASS, ['mode == debug or dcheck_always_on', SKIP]], + 'big-object-literal': [PASS, ['mode == debug', SKIP]], # Runs out of stack space in debug builds. - 'big-array-literal': [PASS, ['mode == debug or dcheck_always_on', SKIP]], + 'big-array-literal': [PASS, ['mode == debug', SKIP]], # BUG(v8:6306). 'wasm/huge-memory': [SKIP], diff --git a/test/webkit/webkit.status b/test/webkit/webkit.status index 93c65a24fe..d5dac2ba9d 100644 --- a/test/webkit/webkit.status +++ b/test/webkit/webkit.status @@ -43,7 +43,7 @@ # Exceeds call stack on windows after MSVS2017 switch. 'fast/js/excessive-comma-usage': [SKIP], }], # system == windows -['mode == debug or dcheck_always_on', { +['mode == debug', { # Too slow in debug mode. 'dfg-int-overflow-in-loop': [SKIP], 'dfg-double-vote-fuzz': [SKIP], @@ -51,7 +51,7 @@ 'sort-large-array': [SKIP], # Too slow with --enable-slow-asserts. 'array-iterate-backwards': [SKIP], -}], # 'mode == debug or dcheck_always_on' +}], # 'mode == debug' ['simulator_run', { # Skip tests that timeout with turbofan. 'array-iterate-backwards': [PASS, NO_VARIANTS], diff --git a/tools/testrunner/base_runner.py b/tools/testrunner/base_runner.py index 651c3018b3..5c8e985203 100644 --- a/tools/testrunner/base_runner.py +++ b/tools/testrunner/base_runner.py @@ -651,7 +651,9 @@ class BaseTestRunner(object): "gcov_coverage": self.build_config.gcov_coverage, "isolates": options.isolates, "mips_arch_variant": mips_arch_variant, - "mode": self.mode_options.status_mode, + "mode": self.mode_options.status_mode + if not self.build_config.dcheck_always_on + else "debug", "msan": self.build_config.msan, "no_harness": options.no_harness, "no_i18n": self.build_config.no_i18n,