Skip to content

Commit 4395803

Browse files
committed
Handle multiple test exclusions correctly
1 parent b5710c2 commit 4395803

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

release-process/test-system.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,9 @@ def config_script_function(config_key):
164164
# Currently AWS Graviton instances have a high failure rate on the `rseq` test
165165
# because of missed timer interrupts
166166
exclude_tests += ["rseq.*"]
167+
ctest_options = []
168+
if exclude_tests:
169+
ctest_options = ['-E', '|'.join(exclude_tests)]
167170
full_script = '\n'.join(
168171
[
169172
config_script_function('setup_commands'),
@@ -176,7 +179,7 @@ def config_script_function(config_key):
176179
'test_firefox=%d'%(1 if args.architecture == 'x86_64' else 0),
177180
# libreoffice uses STREX
178181
'test_libreoffice=%d'%(1 if args.architecture == 'x86_64' else 0),
179-
'ctest_options="%s"'%' '.join('-E %s'%r for r in exclude_tests),
182+
'ctest_options="%s"'%' '.join(c for c in ctest_options),
180183
'cpack_generators=%s'%args.cpack_generators
181184
]).encode('utf-8') + b'\n' + rr_testing_script
182185
vm.ssh(['/bin/bash', '-s'], full_script)

0 commit comments

Comments
 (0)