All tests now respond in a consistent way such that separate lists for
tests with and without subtests are no longer necessary.
v2: fix other references to the test list
Signed-off-by: Thomas Wood <thomas.wood@xxxxxxxxx>
---
docs/reference/intel-gpu-tools/Makefile.am | 2 +-
lib/tests/igt_command_line.sh | 2 +-
tests/Makefile.am | 23 ++++-------------------
3 files changed, 6 insertions(+), 21 deletions(-)
diff --git a/docs/reference/intel-gpu-tools/Makefile.am b/docs/reference/intel-gpu-tools/Makefile.am
index fa19701..0033295 100644
--- a/docs/reference/intel-gpu-tools/Makefile.am
+++ b/docs/reference/intel-gpu-tools/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-TESTLISTS = $(top_builddir)/tests/single-tests.txt $(top_builddir)/tests/multi-tests.txt
+TESTLISTS = $(top_builddir)/tests/test-list.txt
KEYWORDS = (invalid|hang|swap|thrash|crc|tiled|tiling|rte|ctx|render|blt|bsd|vebox|exec|rpm)
xml/igt_test_programs_%_programs.xml: $(TESTLISTS)
diff --git a/lib/tests/igt_command_line.sh b/lib/tests/igt_command_line.sh
index a057943..e83a548 100755
--- a/lib/tests/igt_command_line.sh
+++ b/lib/tests/igt_command_line.sh
@@ -25,7 +25,7 @@
# Check that command line handling works consistently across all tests
#
-TESTLIST=`cat $top_builddir/tests/single-tests.txt $top_builddir/tests/multi-tests.txt`
+TESTLIST=`cat $top_builddir/tests/test-list.txt`
if [ $? -ne 0 ]; then
echo "Error: Could not read test lists"
exit 99
diff --git a/tests/Makefile.am b/tests/Makefile.am
index dc864f4..11f7f96 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -5,26 +5,11 @@ 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 >> $@
noinst_PROGRAMS = \
@@ -52,7 +37,7 @@ dist_pkgdata_DATA = \
EXTRA_PROGRAMS = $(HANG)
EXTRA_DIST = $(common_files)
-CLEANFILES = $(EXTRA_PROGRAMS) single-tests.txt multi-tests.txt
+CLEANFILES = $(EXTRA_PROGRAMS) test-list.txt
AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) $(DEBUG_CFLAGS)\
-I$(srcdir)/.. \
--
2.1.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
