flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-07-23 18:06:18 +00:00
Code Issues Releases Wiki Activity

tests: create a single combined test list

Browse Source 
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@intel.com>
This commit is contained in:
Thomas Wood 2015-03-13 14:15:46 +00:00
parent cff102ebb2
commit e72686b83b
3 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/reference/intel-gpu-tools/Makefile.am
View File

@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in ## 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) KEYWORDS = (invalid|hang|swap|thrash|crc|tiled|tiling|rte|ctx|render|blt|bsd|vebox|exec|rpm)
xml/igt_test_programs_%_programs.xml: $(TESTLISTS) xml/igt_test_programs_%_programs.xml: $(TESTLISTS)

2
lib/tests/igt_command_line.sh
View File

@ -25,7 +25,7 @@
# Check that command line handling works consistently across all tests # 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 if [ $? -ne 0 ]; then
echo "Error: Could not read test lists" echo "Error: Could not read test lists"
exit 99 exit 99

23
tests/Makefile.am
View File

@ -5,26 +5,11 @@ if HAVE_NOUVEAU
endif endif
if BUILD_TESTS if BUILD_TESTS
all-local: single-tests.txt multi-tests.txt all-local: test-list.txt
list-single-tests: test-list.txt: Makefile.sources
@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 TESTLIST > $@
@echo ${single_kernel_tests} >> $@ @echo ${single_kernel_tests} ${multi_kernel_tests} >> $@
@echo END TESTLIST >> $@
multi-tests.txt: Makefile.sources
@echo TESTLIST > $@
@echo ${multi_kernel_tests} >> $@
@echo END TESTLIST >> $@ @echo END TESTLIST >> $@
noinst_PROGRAMS = \ noinst_PROGRAMS = \
@ -52,7 +37,7 @@ dist_pkgdata_DATA = \
EXTRA_PROGRAMS = $(HANG) EXTRA_PROGRAMS = $(HANG)
EXTRA_DIST = $(common_files) 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)\ AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) $(DEBUG_CFLAGS)\
-I$(srcdir)/.. \ -I$(srcdir)/.. \