From 4cb43db1a9c13d0af333e5fed4a35d97643beaf9 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Mon, 22 Jan 2024 09:56:01 +0000
Subject: [PATCH] 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>
---
 test/Makefile.in | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

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