[PATCH i-g-t 2/2] lib/tests: use the "check_" prefix for tests

Thomas Wood
2014-10-29T17:30:57Z

The "check_" prefix ensures the test programs are not installed and are
only built when "make check" is run.

Signed-off-by: Thomas Wood <thomas.wood@intel.com>
---
lib/tests/Makefile.am | 5 +----
lib/tests/Makefile.sources | 12 ++++--------
2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/lib/tests/Makefile.am b/lib/tests/Makefile.am
index 765e3e5..78279fb 100644
--- a/lib/tests/Makefile.am
+++ b/lib/tests/Makefile.am
@@ -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)/../.. \
diff --git a/lib/tests/Makefile.sources b/lib/tests/Makefile.sources
index b13314d..d64c89c 100644
--- a/lib/tests/Makefile.sources
+++ b/lib/tests/Makefile.sources
@@ -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
--
2.1.0