| 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 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 109 "--build-dir=" + build_dir]) | 109 "--build-dir=" + build_dir]) |
| 110 | 110 |
| 111 # Sky tests (Linux-only): | 111 # Sky tests (Linux-only): |
| 112 if target_os == Config.OS_LINUX and ShouldRunTest(Config.TEST_TYPE_DEFAULT, | 112 if target_os == Config.OS_LINUX and ShouldRunTest(Config.TEST_TYPE_DEFAULT, |
| 113 "sky"): | 113 "sky"): |
| 114 # TODO(vtl): Temporary hack: Sky tests are currently really unstable, so | 114 # TODO(vtl): Temporary hack: Sky tests are currently really unstable, so |
| 115 # make the step green even if the tests actually fail. | 115 # make the step green even if the tests actually fail. |
| 116 sky_command = ["python", | 116 sky_command = ["python", |
| 117 os.path.join("mojo", "tools", "run_always_succeed.py")] | 117 os.path.join("mojo", "tools", "run_always_succeed.py")] |
| 118 sky_command += ["sky/tools/test_sky", | 118 sky_command += ["sky/tools/test_sky", |
| 119 "-t", "Debug" if config.is_debug else "Release", | 119 "-t", os.path.basename(build_dir), |
| 120 "--no-new-test-results", "--no-show-results", "--verbose"] | 120 "--no-new-test-results", "--no-show-results", "--verbose"] |
| 121 if config.values.get("builder_name"): | 121 if config.values.get("builder_name"): |
| 122 sky_command += ["--builder-name", config.values["builder_name"]] | 122 sky_command += ["--builder-name", config.values["builder_name"]] |
| 123 if config.values.get("build_number"): | 123 if config.values.get("build_number"): |
| 124 sky_command += ["--build-number", config.values["build_number"]] | 124 sky_command += ["--build-number", config.values["build_number"]] |
| 125 if config.values.get("master_name"): | 125 if config.values.get("master_name"): |
| 126 sky_command += ["--master-name", config.values["master_name"]] | 126 sky_command += ["--master-name", config.values["master_name"]] |
| 127 if config.values.get("test_results_server"): | 127 if config.values.get("test_results_server"): |
| 128 sky_command += ["--test-results-server", | 128 sky_command += ["--test-results-server", |
| 129 config.values["test_results_server"]] | 129 config.values["test_results_server"]] |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 175 config = Config(**json.load(args.config_file)) | 175 config = Config(**json.load(args.config_file)) |
| 176 test_list = GetTestList(config) | 176 test_list = GetTestList(config) |
| 177 json.dump(test_list, args.test_list_file, indent=2) | 177 json.dump(test_list, args.test_list_file, indent=2) |
| 178 args.test_list_file.write("\n") | 178 args.test_list_file.write("\n") |
| 179 | 179 |
| 180 return 0 | 180 return 0 |
| 181 | 181 |
| 182 | 182 |
| 183 if __name__ == "__main__": | 183 if __name__ == "__main__": |
| 184 sys.exit(main()) | 184 sys.exit(main()) |
| OLD | NEW |