[test] Add testing variant aliases.

tools/run-tests.py

 #!/usr/bin/env python
 #
 # Copyright 2012 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
@@ skipping 96 matching lines @@
   ],
   "unittests": [
     "unittests",
   ],
 }
 
 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,
+  # Additional variants, run on a subset of bots.
+  "extra": [],
+}
+
 DEBUG_FLAGS = ["--nohard-abort", "--nodead-code-elimination",
                "--nofold-constants", "--enable-slow-asserts",
                "--debug-code", "--verify-heap"]
 RELEASE_FLAGS = ["--nohard-abort", "--nodead-code-elimination",
                  "--nofold-constants"]
 
 MODES = {
   "debug": {
     "flags": DEBUG_FLAGS,
     "timeout_scalefactor": 4,
@@ skipping 298 matching lines @@
     os.environ['TSAN_OPTIONS'] = " ".join([
       symbolizer,
       'suppressions=%s' % suppressions_file,
       'exit_code=0',
       'report_thread_leaks=0',
       'history_size=7',
       'report_destroy_locked=0',
     ])
 
 def ProcessOptions(options):
-  global ALL_VARIANTS
-  global EXHAUSTIVE_VARIANTS
   global VARIANTS
 
   # First try to auto-detect configurations based on the build if GN was
   # used. This can't be overridden by cmd-line arguments.
   options.auto_detect = False
   build_config_path = os.path.join(
       BASE_DIR, options.outdir, "v8_build_config.json")
   if os.path.exists(build_config_path):
     try:
       with open(build_config_path) as f:
@@ skipping 60 matching lines @@
     options.extra_flags.append("--omit-quit")
 
   if options.novfp3:
     options.extra_flags.append("--noenable-vfp3")
 
   if options.exhaustive_variants:
     # This is used on many bots. It includes a larger set of default variants.
     # 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"]
 
   if options.tsan:
     VARIANTS = ["default"]
 
   if options.j == 0:
     options.j = multiprocessing.cpu_count()
 
   if options.random_seed_stress_count <= 1 and options.random_seed == 0:
     options.random_seed = RandomSeed()
 
   def excl(*args):
     """Returns true if zero or one of multiple arguments are true."""
     return reduce(lambda x, y: x + y, args) <= 1
 
   if not excl(options.no_stress, options.stress_only, options.no_variants,
               bool(options.variants)):
     print("Use only one of --no-stress, --stress-only, --no-variants, "
           "or --variants.")
     return False
   if options.quickcheck:
     VARIANTS = ["default", "stress"]
     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"]
   if options.stress_only:
     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
   if options.predictable:
     VARIANTS = ["default"]
     options.extra_flags.append("--predictable")
     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."
       options.shell_dir = os.path.dirname(options.shell)
   if options.valgrind:
     run_valgrind = os.path.join("tools", "run-valgrind.py")
     # This is OK for distributed running, so we don't need to set no_network.
     options.command_prefix = (["python", "-u", run_valgrind] +
                               options.command_prefix)
   def CheckTestMode(name, option):
@@ skipping 306 matching lines @@
         "--coverage-dir=%s" % options.sancov_dir])
     except:
       print >> sys.stderr, "Error: Merging sancov files failed."
       exit_code = 1
 
   return exit_code
 
 
 if __name__ == "__main__":
   sys.exit(Main())