[swarming] Run unittests together with default tests.

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 34 matching lines @@
 from testrunner.local import progress
 from testrunner.local import testsuite
 from testrunner.local.testsuite import ALL_VARIANTS
 from testrunner.local import utils
 from testrunner.local import verbose
 from testrunner.network import network_execution
 from testrunner.objects import context
 
 
 ARCH_GUESS = utils.DefaultArch()
-DEFAULT_TESTS = [
-  "mjsunit",
-  "unittests",
-  "cctest",
-  "message",
-  "preparser",
-  "intl",
-]
 
 # Map of test name synonyms to lists of test suites. Should be ordered by
 # expected runtimes (suites with slow test cases first). These groups are
 # invoked in seperate steps on the bots.
 TEST_MAP = {
   "default": [
     "mjsunit",
     "cctest",
     "message",
     "preparser",
     "intl",
+    "unittests",
   ],
   "optimize_for_size": [
     "mjsunit",
     "cctest",
     "webkit",
     "intl",
   ],
   "unittests": [
     "unittests",
   ],
@@ skipping 86 matching lines @@
               "mips64el",
               "nacl_ia32",
               "nacl_x64",
               "x87",
               "arm64"]
 
 
 def BuildOptions():
   result = optparse.OptionParser()
   result.usage = '%prog [options] [tests]'
-  result.description = """TESTS: %s""" % (DEFAULT_TESTS)
+  result.description = """TESTS: %s""" % (TEST_MAP["default"])
   result.add_option("--arch",
                     help=("The architecture to run tests for, "
                           "'auto' or 'native' for auto-detect: %s" % SUPPORTED_ARCHS),
                     default="ia32,x64,arm")
   result.add_option("--arch-and-mode",
                     help="Architecture and mode in the format 'arch.mode'",
                     default=None)
   result.add_option("--asan",
                     help="Regard test expectations for ASAN",
                     default=False, action="store_true")
@@ skipping 263 matching lines @@
       print "Unknown %s mode %s" % (name, option)
       return False
     return True
   if not CheckTestMode("flaky test", options.flaky_tests):
     return False
   if not CheckTestMode("slow test", options.slow_tests):
     return False
   if not CheckTestMode("pass|fail test", options.pass_fail_tests):
     return False
   if options.no_i18n:
-    DEFAULT_TESTS.remove("intl")
     TEST_MAP["default"].remove("intl")
   return True
 
 
 def ShardTests(tests, shard_count, shard_run):
   if shard_count < 2:
     return tests
   if shard_run < 1 or shard_run > shard_count:
     print "shard-run not a valid number, should be in [1:shard-count]"
     print "defaulting back to running all tests"
@@ skipping 16 matching lines @@
 
   exit_code = 0
   workspace = os.path.abspath(join(os.path.dirname(sys.argv[0]), ".."))
   if not options.no_presubmit:
     print ">>> running presubmit tests"
     exit_code = subprocess.call(
         [sys.executable, join(workspace, "tools", "presubmit.py")])
 
   suite_paths = utils.GetSuitePaths(join(workspace, "test"))
 
+  # Use default tests if no test configuration was provided at the cmd line.
+  if len(args) == 0:
+    args = ["default"]
+
   # Expand arguments with grouped tests. The args should reflect the list of
   # suites as otherwise filters would break.
   def ExpandTestGroups(name):
     if name in TEST_MAP:
       return [suite for suite in TEST_MAP[arg]]
     else:
       return [name]
   args = reduce(lambda x, y: x + y,
          [ExpandTestGroups(arg) for arg in args],
          [])
 
-  if len(args) == 0:
-    suite_paths = [ s for s in DEFAULT_TESTS if s in suite_paths ]
-  else:
-    args_suites = OrderedDict() # Used as set
-    for arg in args:
-      args_suites[arg.split('/')[0]] = True
-    suite_paths = [ s for s in args_suites if s in suite_paths ]
+  args_suites = OrderedDict() # Used as set
+  for arg in args:
+    args_suites[arg.split('/')[0]] = True
+  suite_paths = [ s for s in args_suites if s in suite_paths ]
 
   suites = []
   for root in suite_paths:
     suite = testsuite.TestSuite.LoadTestSuite(
         os.path.join(workspace, "test", root))
     if suite:
       suites.append(suite)
 
   if options.download_data or options.download_data_only:
     for s in suites:
@@ skipping 182 matching lines @@
     verbose.PrintTestDurations(suites, overall_duration)
 
   if num_tests == 0:
     print("Warning: no tests were run!")
 
   return exit_code
 
 
 if __name__ == "__main__":
   sys.exit(Main())