[test] Add testing variant aliases.

tools/run-tests.py

Index: tools/run-tests.py
diff --git a/tools/run-tests.py b/tools/run-tests.py
index b9f40be0d89c1d5bbd60cb3fc1ab20b0c7d3e7af..20394d8d6ce475489dd981962f03c91c5da998ec 100755
--- a/tools/run-tests.py
+++ b/tools/run-tests.py
@@ -114,12 +114,23 @@ TIMEOUT_DEFAULT = 60
 
 VARIANTS = ["default", "stress", "turbofan"]
 
-EXHAUSTIVE_VARIANTS = VARIANTS + [
+MORE_VARIANTS = [
   "ignition",
   "nocrankshaft",
   "turbofan_opt",
 ]
 
+EXHAUSTIVE_VARIANTS = VARIANTS + MORE_VARIANTS
+
+VARIANT_ALIASES = {
+  # The default for developer workstations.
+  "dev": VARIANTS,
+  # Additional variants, run on all bots.
+  "more": MORE_VARIANTS,

[Michael Achenbach, 2016/08/01 12:59:31]

The "more" set is going to deprecate the current --exhaustive-variants flag.

+  # Additional variants, run on a subset of bots.
+  "exhaustive": [],

[Jakob Kummerow, 2016/08/01 13:44:56]

This seems surprising. Did you mean s/[]/EXHAUSTIVE_VARIANTS/?

[Michael Achenbach, 2016/08/01 13:55:56]

No, as commented above, the "more" entry is going to deprecate exhaustive
variants. The former "exhaustive variants" were never really exhaustive. They
were what the bots ran but the developers don't. But there are even more
variants, which we now call exhaustive.

The set is now empty to allow transitioning variants there in separate CLs. E.g.
--nocrankshaft is going to move there, and probably the new variant
--ignition-staging --turbo --always-opt.

+}
+
 DEBUG_FLAGS = ["--nohard-abort", "--nodead-code-elimination",
                "--nofold-constants", "--enable-slow-asserts",
                "--debug-code", "--verify-heap"]
@@ -438,8 +449,6 @@ def SetupEnvironment(options):
     ])
 
 def ProcessOptions(options):
-  global ALL_VARIANTS
-  global EXHAUSTIVE_VARIANTS
   global VARIANTS
 
   # First try to auto-detect configurations based on the build if GN was
@@ -520,6 +529,8 @@ def ProcessOptions(options):
     # Other options for manipulating variants still apply afterwards.
     VARIANTS = EXHAUSTIVE_VARIANTS
 
+  # TODO(machenbach): Figure out how to test a bigger subset of variants on
+  # msan and tsan.
   if options.msan:
     VARIANTS = ["default"]
 
@@ -546,6 +557,8 @@ def ProcessOptions(options):
     options.slow_tests = "skip"
     options.pass_fail_tests = "skip"
   if options.no_stress:
+    # FIXME(machenbach): This is not very intuitive anymore. Maybe remove a
+    # bunch of these shortcuts and require stating the variants explicitly.
     VARIANTS = ["default", "nocrankshaft"]
   if options.no_variants:
     VARIANTS = ["default"]
@@ -553,6 +566,14 @@ def ProcessOptions(options):
     VARIANTS = ["stress"]
   if options.variants:
     VARIANTS = options.variants.split(",")
+
+    # Resolve variant aliases.
+    VARIANTS = reduce(
+        list.__add__,
+        (VARIANT_ALIASES.get(v, [v]) for v in VARIANTS),
+        [],
+    )
+
     if not set(VARIANTS).issubset(ALL_VARIANTS):
       print "All variants must be in %s" % str(ALL_VARIANTS)
       return False
@@ -562,6 +583,9 @@ def ProcessOptions(options):
     options.extra_flags.append("--verify_predictable")
     options.extra_flags.append("--no-inline-new")
 
+  # Dedupe.
+  VARIANTS = list(set(VARIANTS))
+
   if not options.shell_dir:
     if options.shell:
       print "Warning: --shell is deprecated, use --shell-dir instead."