[test] Enable test coverage for noturbo

BUG=chromium:682617
R=mstarzinger@chromium.org,bmeurer@chromium.org

Change-Id: I1dedc4e2a0cb6e5e42b734c7eb99a40164da4229
Reviewed-on: https://chromium-review.googlesource.com/452498
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Reviewed-by: Benedikt Meurer <bmeurer@chromium.org>
Cr-Commit-Position: refs/heads/master@{#43701}

tools/run-tests.py

@@ -105,11 +105,11 @@ TEST_MAP = {
 TIMEOUT_DEFAULT = 60
 
 # Variants ordered by expected runtime (slowest first).
-VARIANTS = ["ignition_staging", "default", "turbofan"]
+VARIANTS = ["ignition_staging", "default", "noturbofan"]
 
 MORE_VARIANTS = [
   "stress",
-  "turbofan_opt",
+  "noturbofan_stress",
   "ignition",
   "asm_wasm",
   "wasm_traps",

tools/testrunner/local/variants.py

@@ -8,6 +8,8 @@ ALL_VARIANT_FLAGS = {
   "stress": [["--stress-opt", "--always-opt"]],
   "turbofan": [["--turbo"]],
   "turbofan_opt": [["--turbo", "--always-opt"]],
+  "noturbofan": [["--no-turbo"]],
+  "noturbofan_stress": [["--no-turbo", "--stress-opt", "--always-opt"]],
   "nocrankshaft": [["--nocrankshaft"]],
   "ignition": [["--ignition"]],
   "ignition_staging": [["--ignition-staging"]],
@@ -21,6 +23,8 @@ FAST_VARIANT_FLAGS = {
   "default": [[]],
   "stress": [["--stress-opt"]],
   "turbofan": [["--turbo"]],
+  "noturbofan": [["--no-turbo"]],
+  "noturbofan_stress": [["--no-turbo", "--stress-opt"]],
   "nocrankshaft": [["--nocrankshaft"]],
   "ignition": [["--ignition"]],
   "ignition_staging": [["--ignition-staging"]],
@@ -30,5 +34,6 @@ FAST_VARIANT_FLAGS = {
 }
 
 ALL_VARIANTS = set(["default", "stress", "turbofan", "turbofan_opt",
+                    "noturbofan", "noturbofan_opt",
                     "nocrankshaft", "ignition", "ignition_staging",
                     "ignition_turbofan", "asm_wasm", "wasm_traps"])