| OLD | NEW | 
|---|
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python | 
| 2 # | 2 # | 
| 3 # Copyright 2012 the V8 project authors. All rights reserved. | 3 # Copyright 2012 the V8 project authors. All rights reserved. | 
| 4 # Redistribution and use in source and binary forms, with or without | 4 # Redistribution and use in source and binary forms, with or without | 
| 5 # modification, are permitted provided that the following conditions are | 5 # modification, are permitted provided that the following conditions are | 
| 6 # met: | 6 # met: | 
| 7 # | 7 # | 
| 8 #     * Redistributions of source code must retain the above copyright | 8 #     * Redistributions of source code must retain the above copyright | 
| 9 #       notice, this list of conditions and the following disclaimer. | 9 #       notice, this list of conditions and the following disclaimer. | 
| 10 #     * Redistributions in binary form must reproduce the above | 10 #     * Redistributions in binary form must reproduce the above | 
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 51 from testrunner.objects import context | 51 from testrunner.objects import context | 
| 52 | 52 | 
| 53 | 53 | 
| 54 ARCH_GUESS = utils.DefaultArch() | 54 ARCH_GUESS = utils.DefaultArch() | 
| 55 DEFAULT_TESTS = [ | 55 DEFAULT_TESTS = [ | 
| 56   "mjsunit", | 56   "mjsunit", | 
| 57   "unittests", | 57   "unittests", | 
| 58   "cctest", | 58   "cctest", | 
| 59   "message", | 59   "message", | 
| 60   "preparser", | 60   "preparser", | 
|  | 61   "intl", | 
| 61 ] | 62 ] | 
| 62 | 63 | 
| 63 # Map of test name synonyms to lists of test suites. Should be ordered by | 64 # Map of test name synonyms to lists of test suites. Should be ordered by | 
| 64 # expected runtimes (suites with slow test cases first). These groups are | 65 # expected runtimes (suites with slow test cases first). These groups are | 
| 65 # invoked in seperate steps on the bots. | 66 # invoked in seperate steps on the bots. | 
| 66 TEST_MAP = { | 67 TEST_MAP = { | 
| 67   "default": [ | 68   "default": [ | 
| 68     "mjsunit", | 69     "mjsunit", | 
| 69     "cctest", | 70     "cctest", | 
| 70     "message", | 71     "message", | 
| 71     "preparser", | 72     "preparser", | 
|  | 73     "intl", | 
| 72   ], | 74   ], | 
| 73   "optimize_for_size": [ | 75   "optimize_for_size": [ | 
| 74     "mjsunit", | 76     "mjsunit", | 
| 75     "cctest", | 77     "cctest", | 
| 76     "webkit", | 78     "webkit", | 
|  | 79     "intl", | 
| 77   ], | 80   ], | 
| 78   "unittests": [ | 81   "unittests": [ | 
| 79     "unittests", | 82     "unittests", | 
| 80   ], | 83   ], | 
| 81 } | 84 } | 
| 82 | 85 | 
| 83 TIMEOUT_DEFAULT = 60 | 86 TIMEOUT_DEFAULT = 60 | 
| 84 | 87 | 
| 85 VARIANTS = ["default", "stress", "turbofan", "nocrankshaft"] | 88 VARIANTS = ["default", "stress", "turbofan", "nocrankshaft"] | 
| 86 | 89 | 
| (...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 450     if not option in ["run", "skip", "dontcare"]: | 453     if not option in ["run", "skip", "dontcare"]: | 
| 451       print "Unknown %s mode %s" % (name, option) | 454       print "Unknown %s mode %s" % (name, option) | 
| 452       return False | 455       return False | 
| 453     return True | 456     return True | 
| 454   if not CheckTestMode("flaky test", options.flaky_tests): | 457   if not CheckTestMode("flaky test", options.flaky_tests): | 
| 455     return False | 458     return False | 
| 456   if not CheckTestMode("slow test", options.slow_tests): | 459   if not CheckTestMode("slow test", options.slow_tests): | 
| 457     return False | 460     return False | 
| 458   if not CheckTestMode("pass|fail test", options.pass_fail_tests): | 461   if not CheckTestMode("pass|fail test", options.pass_fail_tests): | 
| 459     return False | 462     return False | 
| 460   if not options.no_i18n: | 463   if options.no_i18n: | 
| 461     DEFAULT_TESTS.append("intl") | 464     DEFAULT_TESTS.remove("intl") | 
|  | 465     TEST_MAP["default"].remove("intl") | 
| 462   return True | 466   return True | 
| 463 | 467 | 
| 464 | 468 | 
| 465 def ShardTests(tests, shard_count, shard_run): | 469 def ShardTests(tests, shard_count, shard_run): | 
| 466   if shard_count < 2: | 470   if shard_count < 2: | 
| 467     return tests | 471     return tests | 
| 468   if shard_run < 1 or shard_run > shard_count: | 472   if shard_run < 1 or shard_run > shard_count: | 
| 469     print "shard-run not a valid number, should be in [1:shard-count]" | 473     print "shard-run not a valid number, should be in [1:shard-count]" | 
| 470     print "defaulting back to running all tests" | 474     print "defaulting back to running all tests" | 
| 471     return tests | 475     return tests | 
| (...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 707     verbose.PrintTestDurations(suites, overall_duration) | 711     verbose.PrintTestDurations(suites, overall_duration) | 
| 708 | 712 | 
| 709   if num_tests == 0: | 713   if num_tests == 0: | 
| 710     print("Warning: no tests were run!") | 714     print("Warning: no tests were run!") | 
| 711 | 715 | 
| 712   return exit_code | 716   return exit_code | 
| 713 | 717 | 
| 714 | 718 | 
| 715 if __name__ == "__main__": | 719 if __name__ == "__main__": | 
| 716   sys.exit(Main()) | 720   sys.exit(Main()) | 
| OLD | NEW | 
|---|