Chromium Code Reviews| Index: masters/master.chromium.fyi/master.cfg |
| diff --git a/masters/master.chromium.fyi/master.cfg b/masters/master.chromium.fyi/master.cfg |
| index e9e6a47288726f5321c89b6a56e6e761aa9838f1..6c88fc24a31c583e5fddcab977f76dddabacdee5 100644 |
| --- a/masters/master.chromium.fyi/master.cfg |
| +++ b/masters/master.chromium.fyi/master.cfg |
| @@ -857,31 +857,13 @@ f_chromium_win_x64 = win_out().ChromiumFactory( |
| 'GYP_DEFINES': 'target_arch=x64', |
| }}) |
| -win_clang_tests = [ |
| - 'base_unittests', |
| - 'browser_tests', |
| - 'cc_unittests', |
| - 'components_unittests', |
| - 'content_unittests', |
| - 'crypto_unittests', |
| - 'ipc_tests', |
| - 'net_unittests', |
| - 'printing_unittests', |
| - 'remoting_unittests', |
| - 'sbox_integration_tests', |
| - 'sbox_unittests', |
| - 'sbox_validation_tests', |
| - 'sql_unittests', |
| - 'unit_tests', |
| - 'url_unittests', |
| -] |
| +win_clang_tests = tests_win_1 + tests_win_2 + ['content_unittests'] |
| f_chromium_win_clang = win_out().ChromiumFactory( |
| slave_type='BuilderTester', |
| target='Release', |
| tests=win_clang_tests, |
| - # TODO(hans): Build chromium_builder_tests when LLVM PR11170 is fixed. |
| - options=['--build-tool=ninja', '--'] + win_clang_tests, |
| + options=['--build-tool=ninja', '--', 'chromium_builder_tests'], |
| factory_properties={ |
| 'gclient_env': { |
| 'GYP_DEFINES': 'clang=1', |
| @@ -891,7 +873,7 @@ f_chromium_win_clang_dbg = win_out().ChromiumFactory( |
| slave_type='BuilderTester', |
| target='Debug', |
| tests=win_clang_tests, |
| - options=['--build-tool=ninja', '--'] + win_clang_tests, |
| + options=['--build-tool=ninja', '--', 'chromium_builder_tests'], |
| factory_properties={ |
| 'gclient_env': { |
| 'GYP_DEFINES': 'clang=1 component=static_library', |
| @@ -900,8 +882,8 @@ f_chromium_win_clang_dbg = win_out().ChromiumFactory( |
| f_chromium_win_clang_asan = win_out().ChromiumFactory( |
| slave_type='BuilderTester', |
| target='Release', |
| - tests=win_clang_tests, |
| - options=['--build-tool=ninja', '--'] + win_clang_tests, |
| + tests=without(win_clang_tests, ['sandbox']), |
|
Timur Iskhodzhanov
2014/06/11 07:43:44
This won't work as you'd expect?
Probably you want
Timur Iskhodzhanov
2014/06/11 07:44:57
Please add
# ASan doesn't support sandboxing on Wi
hans
2014/06/11 15:50:23
tests_win_1 doesn't include 'sbox_integration_test
hans
2014/06/11 15:50:23
Done.
Timur Iskhodzhanov
2014/06/11 15:58:45
Oh, didn't know that.
|
| + options=['--build-tool=ninja', '--', 'chromium_builder_tests'], |
| factory_properties={ |
| 'asan': True, |
| 'gclient_env': { |