Skip to content

Commit 6b48e61

Browse files
committed
build-script: run all tests in check-swift-all-* targets, including long tests
1 parent 964bd44 commit 6b48e61

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

test/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,9 @@ if(PYTHONINTERP_FOUND)
244244

245245
list(APPEND LIT_ARGS "--param" "run_only_tests=long_tests")
246246
endif()
247+
if(test_subset STREQUAL "all")
248+
list(APPEND LIT_ARGS "--param" "run_only_tests=all")
249+
endif()
247250

248251
set(directories)
249252
set(dependencies ${test_dependencies})

test/lit.cfg

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ else:
469469
lit_config.fatal("Unknown test mode %r" % swift_test_mode)
470470

471471
# Only run the subset of tests that require 'executable_test'?
472-
swift_run_only_tests = lit_config.params.get('run_only_tests', 'all')
472+
swift_run_only_tests = lit_config.params.get('run_only_tests', 'all_except_long')
473473
if swift_run_only_tests == 'all':
474474
config.available_features.add("executable_test")
475475
elif swift_run_only_tests == 'executable_tests':
@@ -480,6 +480,9 @@ elif swift_run_only_tests == 'non_executable_tests':
480480
elif swift_run_only_tests == 'long_tests':
481481
config.available_features.add("long_test")
482482
config.limit_to_features.add("long_test")
483+
elif swift_run_only_tests == 'all_except_long':
484+
config.available_features.add("executable_test")
485+
config.available_features.add("long_test")
483486
else:
484487
lit_config.fatal("Unknown test mode %r" % swift_run_only_tests)
485488

0 commit comments

Comments
 (0)