Skip to contentSkip to conversation

tests: create a single combined test list

PATCH Superseded Thomas Wood 2 participants 2 messages Mar 13, 2015

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tests: create a single combined test list

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

---
 tests/Makefile.am | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)
tests/Makefile.am +4 -19
index 5efc8d8..d808973 100644
@@ -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)/.. \
Signature · 6 lines
2.1.0

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw
Quoted 4 lines · Thomas Wood

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

Ack on both this and the piglit one. I think we should commit the piglit patch first, then wait about 1 month or so for ppl to update and then apply this one here. Afterwards we can also remove the split in Makefile.sources.
-Daniel

Quoted 52 lines
---
 tests/Makefile.am | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)
tests/Makefile.am +4 -19
index 5efc8d8..d808973 100644
@@ -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)/.. \
Signature · 6 lines
2.1.0

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx