@@ -797,7 +797,7 @@ NPROC_POOL ?= 1
797797export NPROC_POOL
798798
799799run-% : $(OBJDIR ) /%
800- @$(PYTHON ) tests/junit.py --mode tap --ceed-backends $(BACKENDS ) --nproc $(NPROC_TEST ) --pool-size $(NPROC_POOL ) $(<:$(OBJDIR ) /%=% )
800+ @$(PYTHON ) tests/junit.py --mode tap --ceed-backends $(BACKENDS ) --nproc $(NPROC_TEST ) --pool-size $(NPROC_POOL ) --search ' $(subsearch) ' $(<:$(OBJDIR ) /%=% )
801801
802802# The test and prove targets can be controlled via pattern searches. The
803803# default is to run tests and those examples that have no external dependencies.
@@ -809,6 +809,7 @@ run-% : $(OBJDIR)/%
809809search ?= t ex
810810realsearch = $(search:%=%% )
811811matched = $(foreach pattern,$(realsearch ) ,$(filter $(OBJDIR ) /$(pattern ) ,$(tests ) $(allexamples ) ) )
812+ subsearch ?= .*
812813JUNIT_BATCH ?= ''
813814
814815# Test core libCEED
@@ -823,15 +824,15 @@ ctc-% : $(ctests);@$(foreach tst,$(ctests),$(tst) /cpu/$*;)
823824# https://testanything.org/tap-specification.html
824825prove : $(matched )
825826 $(info Testing backends: $(BACKENDS ) )
826- $(PROVE ) $(PROVE_OPTS ) --exec ' $(PYTHON) tests/junit.py --mode tap --ceed-backends $(BACKENDS) --nproc $(NPROC_TEST) --pool-size $(NPROC_POOL)' $( matched: $( OBJDIR ) /%=% )
827+ $(PROVE ) $(PROVE_OPTS ) --exec ' $(PYTHON) tests/junit.py' $( matched: $( OBJDIR ) /%=% ) :: --mode tap --ceed-backends $(BACKENDS ) --nproc $(NPROC_TEST ) --pool-size $(NPROC_POOL ) --search ' $(subsearch) '
827828# Run prove target in parallel
828829prv : ;@$(MAKE ) $(MFLAGS ) V=$(V ) prove
829830
830831prove-all :
831832 +$(MAKE ) prove realsearch=%
832833
833834junit-% : $(OBJDIR ) /%
834- @printf " %10s %s\n" TEST $(<:$(OBJDIR ) /%=% ) ; $(PYTHON ) tests/junit.py --ceed-backends $(BACKENDS ) --nproc $(NPROC_TEST ) --pool-size $(NPROC_POOL ) --junit-batch $(JUNIT_BATCH ) $(<:$(OBJDIR ) /%=% )
835+ @printf " %10s %s\n" TEST $(<:$(OBJDIR ) /%=% ) ; $(PYTHON ) tests/junit.py --ceed-backends $(BACKENDS ) --nproc $(NPROC_TEST ) --pool-size $(NPROC_POOL ) --search ' $(subsearch) ' -- junit-batch $(JUNIT_BATCH ) $(<:$(OBJDIR ) /%=% )
835836
836837junit : $(matched:$(OBJDIR ) /%=junit-% )
837838
0 commit comments