build: fix distcheck
PATCH 1/2 build: fix distcheck
Fix distcheck issues introduced by commit 685e577 (Move library selftests to lib/tests).
--- lib/tests/Makefile.am | 2 +- tests/Makefile.sources | 1 - 2 files changed, 1 insertion(+), 2 deletions(-)
lib/tests/Makefile.am +1 -1
@@ -1,7 +1,7 @@ include Makefile.sources EXTRA_PROGRAMS = $(TESTS_testsuite) -EXTRA_DIST = $(TESTS_scripts) +EXTRA_DIST = $(TESTS_testsuite_scripts) CLEANFILES = $(EXTRA_PROGRAMS)
tests/Makefile.sources +0 -1
@@ -214,7 +214,6 @@ scripts = \ ddx_intel_after_fbdev \ debugfs_wedged \ drm_lib.sh \ - igt_command_line.sh \ $(NULL) IMAGES = pass.png 1080p-left.png 1080p-right.png
Signature · 6 lines
2.1.0 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 lib/tests: use the "check_" prefix for tests
The "check_" prefix ensures the test programs are not installed and are only built when "make check" is run.
--- lib/tests/Makefile.am | 5 +---- lib/tests/Makefile.sources | 12 ++++-------- 2 files changed, 5 insertions(+), 12 deletions(-)
lib/tests/Makefile.am +1 -4
@@ -1,9 +1,6 @@ include Makefile.sources -EXTRA_PROGRAMS = $(TESTS_testsuite) -EXTRA_DIST = $(TESTS_testsuite_scripts) - -CLEANFILES = $(EXTRA_PROGRAMS) +EXTRA_DIST = $(check_SCRIPTS) AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) \ -I$(srcdir)/../.. \
lib/tests/Makefile.sources +4 -8
@@ -1,8 +1,4 @@ -noinst_PROGRAMS = \ - $(TESTS_testsuite) \ - $(NULL) - -TESTS_testsuite = \ +check_PROGRAMS = \ igt_no_exit \ igt_no_exit_list_only \ igt_fork_helper \
@@ -11,13 +7,13 @@ TESTS_testsuite = \ igt_simulation \ $(NULL) -TESTS_testsuite_scripts = \ +check_SCRIPTS = \ igt_command_line.sh \ $(NULL) TESTS = \ - $(TESTS_testsuite) \ - $(TESTS_testsuite_scripts) \ + $(check_PROGRAMS) \ + $(check_SCRIPTS) \ $(NULL) # Test that exercise specific asserts in the test framework library and are
Signature · 6 lines
2.1.0 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH i-g-t 2/2] lib/tests: use the "check_" prefix for tests
Quoted 4 lines · Thomas Wood
The "
check_" prefix ensures the test programs are not installed and are only built when "make check" is run.Signed-off-by Thomas Wood <[email protected]>
This was actually fairly intentional since when developing I always forget to hit make check. And if I do I get pissed that make check _always_ runs all the tests, which is annoying when developing/testing a specific testcase.
So imo it's better to always build them, but not install them. Ok if I revert this, or would that break distcheck again?
-Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx