Skip to content

Commit 12de903

Browse files
committed
Work around pytest bug
Due to pytest-dev/pytest#10169 we can't have command line flags with long names since pytest will check if any argument is a valid path (even if it's registered as a command line option) and Path.exist() may raise an exception which kills the entire pytest process. Work around this by splitting the single list of unsupported options into one option per feature.
1 parent e047f1a commit 12de903

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

Makefile.predicates.mk

+9-9
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ beri_statcounters \
185185
no_dext
186186

187187

188-
GXEMUL_NOSEFLAGS=$(PYTHON_TEST_ATTRIB_SELETOR_FLAG) "$(GXEMUL_UNSUPPORTED_FEATURES)"
188+
GXEMUL_NOSEFLAGS=$(addprefix $(PYTHON_TEST_ATTRIB_SELETOR_FLAG)=,$(GXEMUL_UNSUPPORTED_FEATURES))
189189

190190

191191
####### L3 predicates #######
@@ -225,8 +225,8 @@ L3_UNSUPPORTED_FEATURES+=$(FLOAT_FEATURES) watch
225225

226226
L3_UNSUPPORTED_FEATURES+=ccall_hw_1
227227

228-
L3_NOSEFLAGS=$(PYTHON_TEST_ATTRIB_SELETOR_FLAG) "$(L3_UNSUPPORTED_FEATURES)"
229-
L3_NOSEFLAGS_UNCACHED=$(PYTHON_TEST_ATTRIB_SELETOR_FLAG) "$(L3_UNSUPPORTED_FEATURES) cached"
228+
L3_NOSEFLAGS=$(addprefix $(PYTHON_TEST_ATTRIB_SELETOR_FLAG)=,$(L3_UNSUPPORTED_FEATURES))
229+
L3_NOSEFLAGS_UNCACHED=$(addprefix $(PYTHON_TEST_ATTRIB_SELETOR_FLAG)=,$(L3_UNSUPPORTED_FEATURES) cached)
230230

231231
####### sail predicates #######
232232

@@ -269,9 +269,9 @@ experimental_csc \
269269
watch
270270

271271

272-
SAIL_MIPS_NOSEFLAGS=$(PYTHON_TEST_ATTRIB_SELETOR_FLAG) "$(SAIL_UNSUPPORTED_FEATURES) capabilities"
273-
SAIL_CHERI_NOSEFLAGS=$(PYTHON_TEST_ATTRIB_SELETOR_FLAG) "$(SAIL_UNSUPPORTED_FEATURES)"
274-
SAIL_CHERI128_NOSEFLAGS=$(PYTHON_TEST_ATTRIB_SELETOR_FLAG) "$(SAIL_UNSUPPORTED_FEATURES)"
272+
SAIL_MIPS_NOSEFLAGS=$(addprefix $(PYTHON_TEST_ATTRIB_SELETOR_FLAG)=,$(SAIL_UNSUPPORTED_FEATURES) capabilities)
273+
SAIL_CHERI_NOSEFLAGS=$(addprefix $(PYTHON_TEST_ATTRIB_SELETOR_FLAG)=,$(SAIL_UNSUPPORTED_FEATURES))
274+
SAIL_CHERI128_NOSEFLAGS=$(addprefix $(PYTHON_TEST_ATTRIB_SELETOR_FLAG)=,$(SAIL_UNSUPPORTED_FEATURES))
275275

276276

277277
####### QEMU predicates #######
@@ -355,7 +355,7 @@ QEMU_UNSUPPORTED_FEATURES_FINAL=$(filter-out qemu_magic_nops,$(QEMU_UNSUPPORTED_
355355

356356
# QEMU_UNSUPPORTED_FEATURES+=beri_statcounters
357357

358-
QEMU_NOSEFLAGS=$(PYTHON_TEST_ATTRIB_SELETOR_FLAG) "$(QEMU_UNSUPPORTED_FEATURES_FINAL)" --unsupported-feature-if-equal "$(QEMU_UNSUPPORTED_IF)"
358+
QEMU_NOSEFLAGS=$(addprefix $(PYTHON_TEST_ATTRIB_SELETOR_FLAG)=,$(QEMU_UNSUPPORTED_FEATURES_FINAL)) $(addprefix --unsupported-feature-if-equal=,$(QEMU_UNSUPPORTED_IF))
359359

360360

361361

@@ -423,6 +423,6 @@ endif
423423
endif
424424

425425
ifneq ($(NOSEPRED),)
426-
NOSEFLAGS?=$(PYTHON_TEST_ATTRIB_SELETOR_FLAG) "$(NOSEPRED) uncached" --unsupported-feature-if-equal "$(COMMON_UNSUPPORTED_FEATURES_IF)"
427-
NOSEFLAGS_UNCACHED?=$(PYTHON_TEST_ATTRIB_SELETOR_FLAG) "$(NOSEPRED) cached" --unsupported-feature-if-equal "$(COMMON_UNSUPPORTED_FEATURES_IF)"
426+
NOSEFLAGS?=$(addprefix $(PYTHON_TEST_ATTRIB_SELETOR_FLAG)=,$(NOSEPRED) uncached) $(addprefix --unsupported-feature-if-equal=,$(COMMON_UNSUPPORTED_FEATURES_IF))
427+
NOSEFLAGS_UNCACHED?=$(addprefix $(PYTHON_TEST_ATTRIB_SELETOR_FLAG)=,$(NOSEPRED) cached) $(addprefix --unsupported-feature-if-equal=,$(COMMON_UNSUPPORTED_FEATURES_IF))
428428
endif

0 commit comments

Comments
 (0)