| 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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 "irt_mojo.nexe"), | 93 "irt_mojo.nexe"), |
| 94 os.path.join(build_dir, "clang_newlib_" + config.target_cpu, | 94 os.path.join(build_dir, "clang_newlib_" + config.target_cpu, |
| 95 "monacl_test.nexe")]) | 95 "monacl_test.nexe")]) |
| 96 | 96 |
| 97 # C++ app tests: | 97 # C++ app tests: |
| 98 if ShouldRunTest(Config.TEST_TYPE_DEFAULT, "app"): | 98 if ShouldRunTest(Config.TEST_TYPE_DEFAULT, "app"): |
| 99 AddXvfbEntry("App tests", | 99 AddXvfbEntry("App tests", |
| 100 [os.path.join("mojo", "tools", "apptest_runner.py"), | 100 [os.path.join("mojo", "tools", "apptest_runner.py"), |
| 101 os.path.join("mojo", "tools", "data", "apptests"), | 101 os.path.join("mojo", "tools", "data", "apptests"), |
| 102 build_dir] + verbose_flags) | 102 build_dir] + verbose_flags) |
| 103 # Fusl app tests (Linux excluding Android): |
| 104 if (target_os == Config.OS_LINUX): |
| 105 AddXvfbEntry("Fusl app tests", |
| 106 [os.path.join("mojo", "tools", "apptest_runner.py"), |
| 107 os.path.join("mojo", "tools", "data", "fusl_apptests"), |
| 108 build_dir] + verbose_flags) |
| 103 # Non-SFI NaCl app tests (Linux including Android, no asan): | 109 # Non-SFI NaCl app tests (Linux including Android, no asan): |
| 104 if config.sanitizer != Config.SANITIZER_ASAN: | 110 if config.sanitizer != Config.SANITIZER_ASAN: |
| 105 AddXvfbEntry("Non-SFI NaCl App tests", | 111 AddXvfbEntry("Non-SFI NaCl App tests", |
| 106 [os.path.join("mojo", "tools", "apptest_runner.py"), | 112 [os.path.join("mojo", "tools", "apptest_runner.py"), |
| 107 os.path.join("mojo", "tools", "data", | 113 os.path.join("mojo", "tools", "data", |
| 108 "nacl_nonsfi_apptests"), | 114 "nacl_nonsfi_apptests"), |
| 109 build_dir] + verbose_flags) | 115 build_dir] + verbose_flags) |
| 110 # NaCl app tests (Linux excluding Android): | 116 # NaCl app tests (Linux excluding Android): |
| 111 if (target_os == Config.OS_LINUX and | 117 if (target_os == Config.OS_LINUX and |
| 112 config.sanitizer != Config.SANITIZER_ASAN): | 118 config.sanitizer != Config.SANITIZER_ASAN): |
| (...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 292 config = Config(**json.load(args.config_file)) | 298 config = Config(**json.load(args.config_file)) |
| 293 test_list = GetTestList(config) | 299 test_list = GetTestList(config) |
| 294 json.dump(test_list, args.test_list_file, indent=2) | 300 json.dump(test_list, args.test_list_file, indent=2) |
| 295 args.test_list_file.write("\n") | 301 args.test_list_file.write("\n") |
| 296 | 302 |
| 297 return 0 | 303 return 0 |
| 298 | 304 |
| 299 | 305 |
| 300 if __name__ == "__main__": | 306 if __name__ == "__main__": |
| 301 sys.exit(main()) | 307 sys.exit(main()) |
| OLD | NEW |