tests: create a single combined test list
PATCH v2 1/2 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 Thomas Wood <[email protected]>
--- 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(-)
docs/reference/intel-gpu-tools/Makefile.am +1 -1
@@ -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)
lib/tests/igt_command_line.sh +1 -1
@@ -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
tests/Makefile.am +4 -19
@@ -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)/.. \
Signature · 6 lines
2.1.0 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 tests: install the test list
Cc Joonas Lahtinen <[email protected]>
Signed-off-by Thomas Wood <[email protected]>
--- tests/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tests/Makefile.am +2 -2
@@ -5,8 +5,6 @@ if HAVE_NOUVEAU endif if BUILD_TESTS -all-local: test-list.txt - test-list.txt: Makefile.sources @echo TESTLIST > $@ @echo ${single_kernel_tests} ${multi_kernel_tests} >> $@
@@ -34,6 +32,8 @@ dist_pkgdata_DATA = \ $(IMAGES) \ $(NULL) +pkgdata_DATA = test-list.txt + EXTRA_PROGRAMS = $(HANG) EXTRA_DIST = $(common_files)
Signature · 6 lines
2.1.0 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx