[test] Fix fullcode and ignition testing variants

BUG=chromium:682617
R=mstarzinger@chromium.org,mvstanton@chromium.org,rmcilroy@chromium.org

Change-Id: Id0c904e080bb09e4ac1a127a02b110459442f7f3
Reviewed-on: https://chromium-review.googlesource.com/452484
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Reviewed-by: Michael Starzinger <mstarzinger@chromium.org>
Cr-Commit-Position: refs/heads/master@{#43771}

test/cctest/test-api.cc

@@ -14253,7 +14253,7 @@ void SetFunctionEntryHookTest::RunTest() {
       CHECK_EQ(2, CountInvocations(NULL, "bar"));
       CHECK_EQ(200, CountInvocations("bar", "foo"));
       CHECK_EQ(200, CountInvocations(NULL, "foo"));
-    } else if (i::FLAG_crankshaft || i::FLAG_turbo) {
+    } else if (i::FLAG_crankshaft) {
       // For ignition we don't see the actual functions being called, instead
       // we see the InterpreterEntryTrampoline at least 102 times
       // (100 unoptimized calls to foo, and 2 calls to bar).

test/intl/intl.status

@@ -31,12 +31,6 @@
   'overrides/caching': [PASS, FAIL],
 }],  # ALWAYS
 
-['arch == arm64 and mode == debug and simulator_run == True and variant == ignition', {
-  # Ignition on ARM64 simulator in debug mode.
-  'date-format/timezone': [PASS, ['no_snap', SKIP]],
-  'number-format/check-digit-ranges': [PASS, ['no_snap', SKIP]],
-}],  # 'arch == arm64 and mode == debug and simulator_run == True and variant == ignition'
-
 ['variant == asm_wasm', {
   '*': [SKIP],
 }],  # variant == asm_wasm

test/mjsunit/es6/array-iterator-turbo.js

@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 // Flags: --turbo --turbo-escape --allow-natives-syntax --no-always-opt
+// Flags: --crankshaft --turbo-filter=*
 
 "use strict";
 

test/mjsunit/mjsunit.status

@@ -595,7 +595,7 @@
 }],  # 'arch == ppc64'
 
 ##############################################################################
-['variant == nocrankshaft', {
+['variant == fullcode', {
   'es6/array-iterator-turbo': [SKIP],
 }],  # variant == nocranshaft
 

test/mjsunit/modules-turbo1.js

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 // MODULE
-// Flags: --allow-natives-syntax --turbo --crankshaft
+// Flags: --allow-natives-syntax --turbo --crankshaft --turbo-filter=*
 
 export let x = 0;
 function foo() { x++ };

test/mjsunit/shared-function-tier-up-turbo.js

@@ -4,6 +4,7 @@
 //
 // Flags: --mark-shared-functions-for-tier-up --allow-natives-syntax
 // Flags: --ignition-staging --turbo --crankshaft --no-always-opt
+// Flags: --turbo-filter=*
 
 // If we are always or never optimizing it is useless.
 assertFalse(isAlwaysOptimize());

tools/run-tests.py

@@ -110,7 +110,7 @@ VARIANTS = ["default", "noturbofan"]
 MORE_VARIANTS = [
   "stress",
   "noturbofan_stress",
-  "ignition",
+  "nooptimization",
   "asm_wasm",
   "wasm_traps",
 ]
@@ -123,7 +123,7 @@ VARIANT_ALIASES = {
   # Additional variants, run on all bots.
   "more": MORE_VARIANTS,
   # Additional variants, run on a subset of bots.
-  "extra": ["nocrankshaft"],
+  "extra": ["fullcode"],
 }
 
 DEBUG_FLAGS = ["--nohard-abort", "--nodead-code-elimination",

tools/testrunner/local/variants.py

@@ -10,8 +10,8 @@ ALL_VARIANT_FLAGS = {
   "turbofan_opt": [["--turbo", "--always-opt"]],
   "noturbofan": [["--no-turbo"]],
   "noturbofan_stress": [["--no-turbo", "--stress-opt", "--always-opt"]],
-  "nocrankshaft": [["--nocrankshaft"]],
-  "ignition": [["--ignition"]],
+  "fullcode": [["--nocrankshaft", "--no-turbo"]],
+  "nooptimization": [["--nocrankshaft", "--turbo-filter=~"]],
   "ignition_turbofan": [["--ignition-staging", "--turbo"]],
   "asm_wasm": [["--validate-asm"]],
   "wasm_traps": [["--wasm_guard_pages", "--wasm_trap_handler", "--invoke-weak-callbacks"]],
@@ -24,8 +24,8 @@ FAST_VARIANT_FLAGS = {
   "turbofan": [["--turbo"]],
   "noturbofan": [["--no-turbo"]],
   "noturbofan_stress": [["--no-turbo", "--stress-opt"]],
-  "nocrankshaft": [["--nocrankshaft"]],
-  "ignition": [["--ignition"]],
+  "fullcode": [["--nocrankshaft", "--no-turbo"]],
+  "nooptimization": [["--nocrankshaft", "--turbo-filter=~"]],
   "ignition_turbofan": [["--ignition-staging", "--turbo"]],
   "asm_wasm": [["--validate-asm"]],
   "wasm_traps": [["--wasm_guard_pages", "--wasm_trap_handler", "--invoke-weak-callbacks"]],
@@ -33,5 +33,5 @@ FAST_VARIANT_FLAGS = {
 
 ALL_VARIANTS = set(["default", "stress", "turbofan", "turbofan_opt",
                     "noturbofan", "noturbofan_stress",
-                    "nocrankshaft", "ignition",
+                    "fullcode", "nooptimization",
                     "ignition_turbofan", "asm_wasm", "wasm_traps"])