Upstream broke our dynamic creation of the testlist, and I think adding stupid .tests suffixes everywhere just to appease upstream autohell tools isn't that great. So scrap it, we can use piglit instead. References: https://lists.gnu.org/archive/html/help-debbugs/2013-06/msg00000.html Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxx> --- Makefile.am | 3 --- README | 25 ++++++++++++++----------- tests/Makefile.am | 5 ----- 3 files changed, 14 insertions(+), 19 deletions(-) diff --git a/Makefile.am b/Makefile.am index 67b6563..c4c8de1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,9 +35,6 @@ if BUILD_TESTS SUBDIRS += tests endif -test: - ${MAKE} -C tests test - MAINTAINERCLEANFILES = ChangeLog INSTALL .PHONY: ChangeLog INSTALL diff --git a/README b/README index c484a93..d4325be 100644 --- a/README +++ b/README @@ -24,17 +24,10 @@ tests/ changes. Hopefully this can cover the relevant cases we need to worry about, including backwards compatibility. - Run this tests with "make test" as root from this directory. Note that - no other drm clients (X server) may run. - - "make test" only runs a default set of tests and is useful for - regression testing. Other tests not run are: - - tests that might hang the gpu, see HANG in Makefile.am - - gem_stress, a stress test suite. Look at the source for all the - various options. - - testdisplay is only run in the default mode. testdisplay has tons of - options to test different kms functionality, again read the source for - the details. + Note: The old automake based testrunner had to be scraped due to + upstream changes which broke dynamic creation of the test list. Of + course it is still possible to directly run tests, even when not always + limiting tests to specific subtests (like piglit does). The more comfortable way to run tests is with piglit. First grab piglit from: @@ -60,6 +53,16 @@ tests/ for some useful options. + Piglit only runs a default set of tests and is useful for regression + testing. Other tests not run are: + - tests that might hang the gpu, see HANG in Makefile.am + - gem_stress, a stress test suite. Look at the source for all the + various options. + - testdisplay is only run in the default mode. testdisplay has tons of + options to test different kms functionality, again read the source for + the details. + + lib/ Common helper functions and headers used by the other tools. diff --git a/tests/Makefile.am b/tests/Makefile.am index f3475ad..ebd7c57 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -150,11 +150,6 @@ kernel_tests = \ TESTS = \ $(NULL) -test: - @whoami | grep -q 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} -- 1.8.3.2 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
