Piglit needs a way to grab the latest list of tests to run, so add new
make targets to dump those. Note that for future extendability we'll
dump 2 different lists, one for single-testcase tests and one for
testcases with enumerable subcases. Some support code for the later
will follow in subsequent patches.
Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
---
tests/Makefile.am | 41 ++++++++++++++++++++++++++++++++++-------
1 file changed, 34 insertions(+), 7 deletions(-)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 735eb09..f7b530f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,6 +1,7 @@
noinst_PROGRAMS = \
gem_stress \
$(TESTS_progs) \
+ $(TESTS_progs_M) \
$(HANG) \
$(NULL)
@@ -11,6 +12,9 @@ NOUVEAU_TESTS = \
prime_nv_test
endif
+TESTS_progs_M = \
+ $(NULL)
+
TESTS_progs = \
getversion \
getclient \
@@ -30,7 +34,7 @@ TESTS_progs = \
gem_ringfill \
gem_mmap \
gem_mmap_gtt \
- gem_mmap_offset_exhaustion \
+ #gem_mmap_offset_exhaustion \
gem_non_secure_batch \
gem_pwrite \
gem_pread_after_blit \
@@ -91,6 +95,9 @@ TESTS_progs = \
# IMPORTANT: The ZZ_ tests need to be run last!
# ... and make can't deal with inlined comments ...
+TESTS_scripts_M = \
+ $(NULL)
+
TESTS_scripts = \
debugfs_reader \
debugfs_emon_crash \
@@ -101,18 +108,38 @@ TESTS_scripts = \
ZZ_hangman \
$(NULL)
-kernel_tests = \
+multi_kernel_tests = \
+ $(TESTS_progs_M) \
+ $(TESTS_scripts_M) \
+ $(NULL)
+
+single_kernel_tests = \
$(TESTS_progs) \
$(TESTS_scripts) \
$(NULL)
+kernel_tests = \
+ $(single_kernel_tests) \
+ $(multi_kernel_tests) \
+ $(NULL)
+
TESTS = \
$(NULL)
test:
- whoami | grep root || ( echo ERROR: not running as root; exit 1 )
- ./check_drm_clients
- make TESTS="${kernel_tests}" check
+ @whoami | grep root || ( echo ERROR: not running as root; exit 1 )
+ @./check_drm_clients
+ @make TESTS="${kernel_tests}" check
+
+list-single-tests:
+ @echo TESTLIST
+ @echo ${single_kernel_tests}
+ @echo END TESTLIST
+
+list-multi-tests:
+ @echo TESTLIST
+ @echo ${multi_kernel_tests}
+ @echo END TESTLIST
HANG = \
gem_bad_batch \
@@ -121,8 +148,8 @@ HANG = \
gem_bad_address \
$(NULL)
-EXTRA_PROGRAMS = $(TESTS_progs) $(HANG)
-EXTRA_DIST = $(TESTS_scripts) drm_lib.sh check_drm_clients debugfs_wedged
+EXTRA_PROGRAMS = $(TESTS_progs) $(TESTS_progs_M) $(HANG)
+EXTRA_DIST = $(TESTS_scripts) $(TESTS_scripts_M) drm_lib.sh check_drm_clients debugfs_wedged
CLEANFILES = $(EXTRA_PROGRAMS)
AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) \
--
1.7.11.7
