Commit e72686b8 authored by Thomas Wood's avatar Thomas Wood

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.

v2: fix other references to the test list
Signed-off-by: default avatarThomas Wood <thomas.wood@intel.com>
parent cff102eb
## 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)
......
......@@ -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
......
......@@ -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)/.. \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment