| OLD | NEW | 
|---|
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python | 
| 2 # Copyright 2014 The Chromium Authors. All rights reserved. | 2 # Copyright 2014 The Chromium Authors. All rights reserved. | 
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be | 
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. | 
| 5 | 5 | 
| 6 """Central list of tests to run (as appropriate for a given config). Add tests | 6 """Central list of tests to run (as appropriate for a given config). Add tests | 
| 7 to run by modifying this file. | 7 to run by modifying this file. | 
| 8 | 8 | 
| 9 Note that this file is both imported (by mojob.py) and run directly (via a | 9 Note that this file is both imported (by mojob.py) and run directly (via a | 
| 10 recipe).""" | 10 recipe).""" | 
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 158               os.path.join("mojo", "dart", "observatory_tester", "runner.py"), | 158               os.path.join("mojo", "dart", "observatory_tester", "runner.py"), | 
| 159               "--build-dir=" + build_dir, | 159               "--build-dir=" + build_dir, | 
| 160               "--dart-exe=third_party/dart-sdk/dart-sdk/bin/dart"]) | 160               "--dart-exe=third_party/dart-sdk/dart-sdk/bin/dart"]) | 
| 161 | 161 | 
| 162   # mojo tools unit tests: | 162   # mojo tools unit tests: | 
| 163   if ShouldRunTest(Config.TEST_TYPE_DEFAULT, Config.TEST_TYPE_UNIT, "tools"): | 163   if ShouldRunTest(Config.TEST_TYPE_DEFAULT, Config.TEST_TYPE_UNIT, "tools"): | 
| 164     AddEntry("Mojo tools unit tests", | 164     AddEntry("Mojo tools unit tests", | 
| 165              ["python", os.path.join("mojo", "tools", "testing", | 165              ["python", os.path.join("mojo", "tools", "testing", | 
| 166                                      "mojom_fetcher", | 166                                      "mojom_fetcher", | 
| 167                                      "mojom_fetcher_tests.py")]) | 167                                      "mojom_fetcher_tests.py")]) | 
|  | 168 | 
|  | 169   # Dart mojom package generate.dart script tests: | 
|  | 170   if target_os == Config.OS_LINUX: | 
|  | 171     AddEntry("Dart mojom package generate tests", | 
|  | 172         [os.path.join("third_party", "dart-sdk", "dart-sdk", "bin", "dart"), | 
|  | 173          "--checked", | 
|  | 174          "-p", os.path.join("mojo", "dart", "mojom", "packages"), | 
|  | 175          os.path.join("mojo", "dart", "mojom", "test", "generate_test.dart")]) | 
|  | 176 | 
| 168   # Perf tests ----------------------------------------------------------------- | 177   # Perf tests ----------------------------------------------------------------- | 
| 169 | 178 | 
| 170   if target_os == Config.OS_LINUX and ShouldRunTest(Config.TEST_TYPE_PERF): | 179   if target_os == Config.OS_LINUX and ShouldRunTest(Config.TEST_TYPE_PERF): | 
| 171     perf_id = "linux_%s" % ("debug" if config.is_debug else "release") | 180     perf_id = "linux_%s" % ("debug" if config.is_debug else "release") | 
| 172     test_names = ["mojo_public_system_perftests", | 181     test_names = ["mojo_public_system_perftests", | 
| 173                   "mojo_public_bindings_perftests"] | 182                   "mojo_public_bindings_perftests"] | 
| 174 | 183 | 
| 175     for test_name in test_names: | 184     for test_name in test_names: | 
| 176       command = ["python", | 185       command = ["python", | 
| 177                  os.path.join("mojo", "tools", "perf_test_runner.py"), | 186                  os.path.join("mojo", "tools", "perf_test_runner.py"), | 
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 219   config = Config(**json.load(args.config_file)) | 228   config = Config(**json.load(args.config_file)) | 
| 220   test_list = GetTestList(config) | 229   test_list = GetTestList(config) | 
| 221   json.dump(test_list, args.test_list_file, indent=2) | 230   json.dump(test_list, args.test_list_file, indent=2) | 
| 222   args.test_list_file.write("\n") | 231   args.test_list_file.write("\n") | 
| 223 | 232 | 
| 224   return 0 | 233   return 0 | 
| 225 | 234 | 
| 226 | 235 | 
| 227 if __name__ == "__main__": | 236 if __name__ == "__main__": | 
| 228   sys.exit(main()) | 237   sys.exit(main()) | 
| OLD | NEW | 
|---|