|
94 | 94 | 'distributed/test_ddp_under_dist_autograd',
|
95 | 95 | ]
|
96 | 96 |
|
97 |
| -WINDOWS_BLACKLIST = [ |
| 97 | +WINDOWS_BLOCKLIST = [ |
98 | 98 | 'distributed/nn/jit/test_instantiator',
|
99 | 99 | 'distributed/nn/api/test_remote_module_spawn',
|
100 | 100 | 'distributed/rpc/faulty_agent/test_dist_autograd_spawn',
|
|
112 | 112 | 'distributed/test_ddp_under_dist_autograd',
|
113 | 113 | ]
|
114 | 114 |
|
115 |
| -ROCM_BLACKLIST = [ |
| 115 | +ROCM_BLOCKLIST = [ |
116 | 116 | 'distributed/nn/jit/test_instantiator',
|
117 | 117 | 'distributed/nn/api/test_remote_module_spawn',
|
118 | 118 | 'distributed/rpc/faulty_agent/test_dist_autograd_spawn',
|
|
135 | 135 | 'test_openmp',
|
136 | 136 | ]
|
137 | 137 |
|
138 |
| -RUN_PARALLEL_BLACKLIST = [ |
| 138 | +RUN_PARALLEL_BLOCKLIST = [ |
139 | 139 | 'test_cpp_extensions_jit',
|
140 | 140 | 'test_expecttest',
|
141 | 141 | 'test_jit_disabled',
|
@@ -232,7 +232,7 @@ def run_test(executable, test_module, test_directory, options, *extra_unittest_a
|
232 | 232 | unittest_args = options.additional_unittest_args
|
233 | 233 | if options.verbose:
|
234 | 234 | unittest_args.append('--verbose')
|
235 |
| - if test_module in RUN_PARALLEL_BLACKLIST: |
| 235 | + if test_module in RUN_PARALLEL_BLOCKLIST: |
236 | 236 | unittest_args = [arg for arg in unittest_args if not arg.startswith('--run-parallel')]
|
237 | 237 | # Can't call `python -m unittest test_*` here because it doesn't run code
|
238 | 238 | # in `if __name__ == '__main__': `. So call `python test_*.py` instead.
|
@@ -433,9 +433,9 @@ def parse_args():
|
433 | 433 | ' where you want to run all tests, but care more about some set, '
|
434 | 434 | 'e.g. after making a change to a specific component')
|
435 | 435 | parser.add_argument(
|
436 |
| - '--ignore-win-blacklist', |
| 436 | + '--ignore-win-blocklist', |
437 | 437 | action='store_true',
|
438 |
| - help='always run blacklisted windows tests') |
| 438 | + help='always run blocklisted windows tests') |
439 | 439 | parser.add_argument(
|
440 | 440 | '--determine-from',
|
441 | 441 | help='File of affected source filenames to determine which tests to run.')
|
@@ -527,19 +527,19 @@ def get_selected_tests(options):
|
527 | 527 |
|
528 | 528 | selected_tests = exclude_tests(options.exclude, selected_tests)
|
529 | 529 |
|
530 |
| - if sys.platform == 'win32' and not options.ignore_win_blacklist: |
| 530 | + if sys.platform == 'win32' and not options.ignore_win_blocklist: |
531 | 531 | target_arch = os.environ.get('VSCMD_ARG_TGT_ARCH')
|
532 | 532 | if target_arch != 'x64':
|
533 |
| - WINDOWS_BLACKLIST.append('cpp_extensions_aot_no_ninja') |
534 |
| - WINDOWS_BLACKLIST.append('cpp_extensions_aot_ninja') |
535 |
| - WINDOWS_BLACKLIST.append('cpp_extensions_jit') |
536 |
| - WINDOWS_BLACKLIST.append('jit') |
537 |
| - WINDOWS_BLACKLIST.append('jit_fuser') |
| 533 | + WINDOWS_BLOCKLIST.append('cpp_extensions_aot_no_ninja') |
| 534 | + WINDOWS_BLOCKLIST.append('cpp_extensions_aot_ninja') |
| 535 | + WINDOWS_BLOCKLIST.append('cpp_extensions_jit') |
| 536 | + WINDOWS_BLOCKLIST.append('jit') |
| 537 | + WINDOWS_BLOCKLIST.append('jit_fuser') |
538 | 538 |
|
539 |
| - selected_tests = exclude_tests(WINDOWS_BLACKLIST, selected_tests, 'on Windows') |
| 539 | + selected_tests = exclude_tests(WINDOWS_BLOCKLIST, selected_tests, 'on Windows') |
540 | 540 |
|
541 | 541 | elif TEST_WITH_ROCM:
|
542 |
| - selected_tests = exclude_tests(ROCM_BLACKLIST, selected_tests, 'on ROCm') |
| 542 | + selected_tests = exclude_tests(ROCM_BLOCKLIST, selected_tests, 'on ROCm') |
543 | 543 |
|
544 | 544 | return selected_tests
|
545 | 545 |
|
|
0 commit comments