test: Don't distinguish between different categories of tests

It's reasonable to assume that any of them might need a display and an
audio backend. We run them with SDL_VIDEODRIVER and SDL_AUDIODRIVER
set to dummy anyway.

Signed-off-by: Simon McVittie <smcv@collabora.com>
This commit is contained in:
Simon McVittie 2024-01-22 09:56:01 +00:00 committed by Sam Lantinga
parent 237535b23a
commit 4cb43db1a9

View file

@ -95,7 +95,7 @@ installedtestsmetadir = $(datadir)/installed-tests/SDL2
generatetestmeta: generatetestmeta:
rm -f *.test rm -f *.test
set -e; for exe in $(noninteractive) $(needs_audio) $(needs_display); do \ set -e; for exe in $(TESTS); do \
sed \ sed \
-e 's#@installedtestsdir@#$(installedtestsdir)#g' \ -e 's#@installedtestsdir@#$(installedtestsdir)#g' \
-e "s#@exe@#$$exe#g" \ -e "s#@exe@#$$exe#g" \
@ -386,8 +386,11 @@ distclean: clean
rm -f config.status config.cache config.log rm -f config.status config.cache config.log
rm -rf $(srcdir)/autom4te* rm -rf $(srcdir)/autom4te*
noninteractive = \ TESTS = \
testatomic$(EXE) \ testatomic$(EXE) \
testaudioinfo$(EXE) \
testbounds$(EXE) \
testdisplayinfo$(EXE) \
testerror$(EXE) \ testerror$(EXE) \
testevdev$(EXE) \ testevdev$(EXE) \
testfilesystem$(EXE) \ testfilesystem$(EXE) \
@ -396,23 +399,12 @@ noninteractive = \
testplatform$(EXE) \ testplatform$(EXE) \
testpower$(EXE) \ testpower$(EXE) \
testqsort$(EXE) \ testqsort$(EXE) \
testsurround$(EXE) \
testthread$(EXE) \ testthread$(EXE) \
testtimer$(EXE) \ testtimer$(EXE) \
testver$(EXE) \ testver$(EXE) \
$(NULL) $(NULL)
needs_audio = \
testaudioinfo$(EXE) \
testsurround$(EXE) \
$(NULL)
needs_display = \
testbounds$(EXE) \
testdisplayinfo$(EXE) \
$(NULL)
TESTS = $(noninteractive) $(needs_audio) $(needs_display)
check: check:
@set -e; \ @set -e; \
status=0; \ status=0; \