[Intel-gfx] [PATCH i-g-t] tests: create a single combined test list

[Thomas Wood]

All tests now respond in a consistent way such that separate lists for
tests with and without subtests are no longer necessary.

Signed-off-by: Thomas Wood <thomas.wood at intel.com>
---
 tests/Makefile.am | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5efc8d8..d808973 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -5,32 +5,17 @@ if HAVE_NOUVEAU
 endif
 
 if BUILD_TESTS
-all-local: single-tests.txt multi-tests.txt
+all-local: test-list.txt
 
-list-single-tests:
-	@echo TESTLIST
-	@echo ${single_kernel_tests}
-	@echo END TESTLIST
-
-list-multi-tests:
-	@echo TESTLIST
-	@echo ${multi_kernel_tests}
-	@echo END TESTLIST
-
-single-tests.txt: Makefile.sources
-	@echo TESTLIST > $@
-	@echo ${single_kernel_tests} >> $@
-	@echo END TESTLIST >> $@
-
-multi-tests.txt: Makefile.sources
+test-list.txt: Makefile.sources
 	@echo TESTLIST > $@
-	@echo ${multi_kernel_tests} >> $@
+	@echo ${single_kernel_tests} ${multi_kernel_tests} >> $@
 	@echo END TESTLIST >> $@
 
 EXTRA_PROGRAMS = $(TESTS_progs) $(TESTS_progs_M) $(HANG)
 EXTRA_DIST = $(TESTS_scripts) $(TESTS_scripts_M) $(scripts) $(IMAGES) $(common_files)
 
-CLEANFILES = $(EXTRA_PROGRAMS) single-tests.txt multi-tests.txt
+CLEANFILES = $(EXTRA_PROGRAMS) test-list.txt
 
 AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) \
 	-I$(srcdir)/.. \
-- 
2.1.0