Chromium Code Reviews| 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 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 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 # Non-SFI NaCl app tests (Linux including Android, no asan): | 103 # Non-SFI NaCl app tests (Linux including Android, no asan): |
| 104 if config.sanitizer != Config.SANITIZER_ASAN: | 104 if config.sanitizer != Config.SANITIZER_ASAN: |
| 105 AddXvfbEntry("Non-SFI NaCl App tests", | 105 AddXvfbEntry("Non-SFI NaCl App tests", |
| 106 [os.path.join("mojo", "tools", "apptest_runner.py"), | 106 [os.path.join("mojo", "tools", "apptest_runner.py"), |
| 107 os.path.join("mojo", "tools", "data", | 107 os.path.join("mojo", "tools", "data", |
| 108 "nacl_nonsfi_apptests"), | 108 "nacl_nonsfi_apptests"), |
| 109 build_dir] + verbose_flags) | 109 build_dir] + verbose_flags) |
| 110 # Fusl app tests (Linux excluding Android) | |
|
viettrungluu
2016/02/17 22:18:04
nit: comment needs ':'
Also, I'd stick this block
kulakowski
2016/02/17 22:41:52
Done.
| |
| 111 if (target_os == Config.OS_LINUX): | |
| 112 AddXvfbEntry("Fusl app tests", | |
| 113 [os.path.join("mojo", "tools", "apptest_runner.py"), | |
| 114 os.path.join("mojo", "tools", "data", "fusl_apptests"), | |
| 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): |
| 113 # TODO(smklein): Add for Android once tests are pexes. | 119 # TODO(smklein): Add for Android once tests are pexes. |
| 114 AddXvfbEntry("NaCl app tests", | 120 AddXvfbEntry("NaCl app tests", |
| 115 [os.path.join("mojo", "tools", "apptest_runner.py"), | 121 [os.path.join("mojo", "tools", "apptest_runner.py"), |
| 116 os.path.join("mojo", "tools", "data", "nacl_apptests"), | 122 os.path.join("mojo", "tools", "data", "nacl_apptests"), |
| 117 build_dir] + verbose_flags) | 123 build_dir] + verbose_flags) |
| 118 | 124 |
| 119 # Go unit tests (Linux-only): | 125 # Go unit tests (Linux-only): |
| (...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 299 config = Config(**json.load(args.config_file)) | 305 config = Config(**json.load(args.config_file)) |
| 300 test_list = GetTestList(config) | 306 test_list = GetTestList(config) |
| 301 json.dump(test_list, args.test_list_file, indent=2) | 307 json.dump(test_list, args.test_list_file, indent=2) |
| 302 args.test_list_file.write("\n") | 308 args.test_list_file.write("\n") |
| 303 | 309 |
| 304 return 0 | 310 return 0 |
| 305 | 311 |
| 306 | 312 |
| 307 if __name__ == "__main__": | 313 if __name__ == "__main__": |
| 308 sys.exit(main()) | 314 sys.exit(main()) |
| OLD | NEW |