[test] Remove some deprecated test-runner variant shortcuts

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 283 matching lines @@
                     dest="no_network", action="store_true")
   result.add_option("--no-presubmit", "--nopresubmit",
                     help='Skip presubmit checks (deprecated)',
                     default=False, dest="no_presubmit", action="store_true")
   result.add_option("--no-snap", "--nosnap",
                     help='Test a build compiled without snapshot.',
                     default=False, dest="no_snap", action="store_true")
   result.add_option("--no-sorting", "--nosorting",
                     help="Don't sort tests according to duration of last run.",
                     default=False, dest="no_sorting", action="store_true")
-  result.add_option("--no-stress", "--nostress",
-                    help="Don't run crankshaft --always-opt --stress-op test",
-                    default=False, dest="no_stress", action="store_true")
   result.add_option("--no-variants", "--novariants",
                     help="Don't run any testing variants",
                     default=False, dest="no_variants", action="store_true")
   result.add_option("--variants",
                     help="Comma-separated list of testing variants;"
                     " default: \"%s\"" % ",".join(VARIANTS))
   result.add_option("--exhaustive-variants",
                     default=False, action="store_true",
                     help="Use exhaustive set of default variants:"
                     " \"%s\"" % ",".join(EXHAUSTIVE_VARIANTS))
@@ skipping 25 matching lines @@
   result.add_option("--shard-run",
                     help="Run this shard from the split up tests.",
                     default=1, type="int")
   result.add_option("--shell", help="DEPRECATED! use --shell-dir", default="")
   result.add_option("--shell-dir", help="Directory containing executables",
                     default="")
   result.add_option("--dont-skip-slow-simulator-tests",
                     help="Don't skip more slow tests when using a simulator.",
                     default=False, action="store_true",
                     dest="dont_skip_simulator_slow_tests")
-  result.add_option("--stress-only",
-                    help="Only run tests with --always-opt --stress-opt",
-                    default=False, action="store_true")
   result.add_option("--swarming",
                     help="Indicates running test driver on swarming.",
                     default=False, action="store_true")
   result.add_option("--time", help="Print timing information after running",
                     default=False, action="store_true")
   result.add_option("-t", "--timeout", help="Timeout in seconds",
                     default=TIMEOUT_DEFAULT, type="int")
   result.add_option("--tsan",
                     help="Regard test expectations for TSAN",
                     default=False, action="store_true")
@@ skipping 173 matching lines @@
   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.")
+  if not excl(options.no_variants, bool(options.variants)):
+    print("Use only one of --no-variants or --variants.")
     return False
   if options.quickcheck:
     VARIANTS = ["default", "stress"]

[Michael Achenbach, 2016/08/01 15:05:49]

I'm also not so happy about this anymore, but I'll think about it in a separate
CL.

     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),
         [],
     )
 
@@ skipping 327 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())