From e398bf81d79a85505a5d00c7bb875ed8ea61ebe7 Mon Sep 17 00:00:00 2001 From: Michael Starzinger Date: Thu, 27 Jul 2017 15:28:50 +0200 Subject: [PATCH] [test] Remove deprecated "fullcode" test variant. Note that this also renames the existing "asm_wasm" variant to use the more appropriate "stress_asm_wasm" name. R=rmcilroy@chromium.org BUG=v8:6409 Cq-Include-Trybots: master.tryserver.v8:v8_linux_noi18n_rel_ng Change-Id: I1f9550cd03874c678f4583047a4e123a6f090250 Reviewed-on: https://chromium-review.googlesource.com/584879 Commit-Queue: Michael Starzinger Reviewed-by: Ross McIlroy Cr-Commit-Position: refs/heads/master@{#46937} --- test/debugger/debugger.status | 20 -------------------- test/inspector/inspector.status | 15 --------------- test/mjsunit/mjsunit.status | 5 ----- test/test262/test262.status | 5 ----- test/webkit/webkit.status | 4 ++-- tools/run-tests.py | 3 +-- tools/testrunner/local/variants.py | 10 ++++------ 7 files changed, 7 insertions(+), 55 deletions(-) diff --git a/test/debugger/debugger.status b/test/debugger/debugger.status index f04fe0439e..bbb4507bdf 100644 --- a/test/debugger/debugger.status +++ b/test/debugger/debugger.status @@ -86,24 +86,4 @@ 'debug/debug-liveedit-restart-frame': [SKIP], }], # 'arch == s390 or arch == s390x' -############################################################################## -['variant == fullcode', { - # fullcode doesn't generate precise return positions - 'debug/debug-multiple-var-decl': [SKIP], - 'debug/debug-step-into-valueof': [SKIP], - 'regress/regress-5901-2': [SKIP], - 'debug/debug-step-into-json': [SKIP], - 'debug/es6/debug-step-destructuring-assignment': [SKIP], - 'debug/es6/debug-step-into-regexp-subclass': [SKIP], - 'debug/es8/async-debug-step-in': [SKIP], - 'debug/debug-stepin-builtin-callback-opt': [SKIP], - 'debug/debug-stepin-foreach': [SKIP], - 'debug/es6/debug-stepin-default-parameters': [SKIP], - 'debug/es6/debug-stepin-proxies': [SKIP], - 'debug/es6/debug-promises/stepin-handler': [SKIP], - 'debug/debug-liveedit-stepin': [SKIP], - 'debug/es6/debug-stepin-microtasks': [SKIP], - 'debug/ignition/elided-instruction': [SKIP], - 'debug/es6/debug-stepin-string-template': [SKIP], -}], # variant == fullcode ] diff --git a/test/inspector/inspector.status b/test/inspector/inspector.status index 78343f7dcc..a13bb5b94b 100644 --- a/test/inspector/inspector.status +++ b/test/inspector/inspector.status @@ -26,19 +26,4 @@ '*': [SKIP], }], # variant == wasm_traps -############################################################################## -['variant == fullcode', { - # fullcode doesn't generate precise return positions - 'debugger/return-break-locations': [SKIP], - 'debugger/for-of-loops': [SKIP], - 'debugger/break-locations-var-init': [SKIP], - 'debugger/framework-precise-ranges': [SKIP], - 'debugger/step-snapshot': [SKIP], - 'debugger/step-into-next-script': [SKIP], - 'debugger/asm-js-breakpoint-before-exec': [SKIP], - 'debugger/break-locations-await': [SKIP], - 'debugger/get-possible-breakpoints': [SKIP], - 'debugger/stepping-with-blackboxed-ranges': [SKIP], -}], # variant == fullcode - ] diff --git a/test/mjsunit/mjsunit.status b/test/mjsunit/mjsunit.status index 90b56e33a9..e1d03540d2 100644 --- a/test/mjsunit/mjsunit.status +++ b/test/mjsunit/mjsunit.status @@ -588,11 +588,6 @@ 'regress/regress-353551': [SKIP], }], # 'arch == ppc64' -############################################################################## -['variant == fullcode', { - 'es6/array-iterator-turbo': [SKIP], -}], # variant == nocranshaft - ############################################################################## ['variant == stress', { 'es6/array-iterator-turbo': [SKIP], diff --git a/test/test262/test262.status b/test/test262/test262.status index 99c5626959..c22b2a2b3e 100644 --- a/test/test262/test262.status +++ b/test/test262/test262.status @@ -726,11 +726,6 @@ 'built-ins/Promise/prototype/then/deferred-is-resolved-value': [SKIP], }], # asan == True -['asan and variant == fullcode', { - # Demands too many resources to test the old pipeline with asan. - '*': [SKIP], -}], # asan and variant == fullcode - ['asan == True or msan == True or tsan == True', { # https://bugs.chromium.org/p/v8/issues/detail?id=4639 # The failed allocation causes an asan/msan/tsan error diff --git a/test/webkit/webkit.status b/test/webkit/webkit.status index 93e694ed4f..e8a24abd50 100644 --- a/test/webkit/webkit.status +++ b/test/webkit/webkit.status @@ -112,10 +112,10 @@ }], # 'gcov_coverage' ############################################################################## -['variant == asm_wasm', { +['variant == stress_asm_wasm', { # Stack size too large with asm.js validator. 'fast/js/excessive-comma-usage': [SKIP], -}], # variant == asm_wasm +}], # variant == stress_asm_wasm ############################################################################## ['variant == wasm_traps', { diff --git a/tools/run-tests.py b/tools/run-tests.py index 9b74e3d786..377b6ae25d 100755 --- a/tools/run-tests.py +++ b/tools/run-tests.py @@ -114,8 +114,7 @@ VARIANTS = ["default"] MORE_VARIANTS = [ "stress", "nooptimization", - "fullcode", - "asm_wasm", + "stress_asm_wasm", "wasm_traps", ] diff --git a/tools/testrunner/local/variants.py b/tools/testrunner/local/variants.py index 30fc3e959e..4d274abc56 100644 --- a/tools/testrunner/local/variants.py +++ b/tools/testrunner/local/variants.py @@ -6,12 +6,11 @@ ALL_VARIANT_FLAGS = { "default": [[]], "stress": [["--stress-opt", "--always-opt"]], - "fullcode": [["--noopt", "--stress-fullcodegen"]], # No optimization means disable all optimizations. OptimizeFunctionOnNextCall # would not force optimization too. It turns into a Nop. Please see # https://chromium-review.googlesource.com/c/452620/ for more discussion. "nooptimization": [["--noopt"]], - "asm_wasm": [["--validate-asm", "--stress-validate-asm", "--suppress-asm-messages"]], + "stress_asm_wasm": [["--validate-asm", "--stress-validate-asm", "--suppress-asm-messages"]], "wasm_traps": [["--wasm_guard_pages", "--wasm_trap_handler", "--invoke-weak-callbacks"]], } @@ -19,14 +18,13 @@ ALL_VARIANT_FLAGS = { FAST_VARIANT_FLAGS = { "default": [[]], "stress": [["--stress-opt"]], - "fullcode": [["--noopt", "--stress-fullcodegen"]], # No optimization means disable all optimizations. OptimizeFunctionOnNextCall # would not force optimization too. It turns into a Nop. Please see # https://chromium-review.googlesource.com/c/452620/ for more discussion. "nooptimization": [["--noopt"]], - "asm_wasm": [["--validate-asm", "--stress-validate-asm", "--suppress-asm-messages"]], + "stress_asm_wasm": [["--validate-asm", "--stress-validate-asm", "--suppress-asm-messages"]], "wasm_traps": [["--wasm_guard_pages", "--wasm_trap_handler", "--invoke-weak-callbacks"]], } -ALL_VARIANTS = set(["default", "stress", "fullcode", "nooptimization", - "asm_wasm", "wasm_traps"]) +ALL_VARIANTS = set(["default", "stress", "nooptimization", "stress_asm_wasm", + "wasm_traps"])