From 922e6775e0c731c7155e80de4cca3cd74fca2f9a Mon Sep 17 00:00:00 2001
From: Karel Zak
Date: Mon, 30 Jul 2012 17:59:16 +0200
Subject: build-sys: move tests to check_PROGRAMS

Thanks to Mike Frysinger.

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 Documentation/howto-tests.txt  | 3 +++
 Makefile.am                    | 1 +
 lib/Makemodule.am              | 6 +++---
 libblkid/samples/Makemodule.am | 2 +-
 libblkid/src/Makemodule.am     | 2 +-
 libmount/src/Makemodule.am     | 2 +-
 libuuid/src/Makemodule.am      | 2 +-
 login-utils/Makemodule.am      | 2 +-
 tests/helpers/Makemodule.am    | 8 ++++----
 9 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/Documentation/howto-tests.txt b/Documentation/howto-tests.txt
index c812a3929..06abba781 100644
--- a/Documentation/howto-tests.txt
+++ b/Documentation/howto-tests.txt
@@ -5,6 +5,9 @@
  It's expected that for each invasive change or important bugfix you will
  include a test to your patch.
 
+ Compile tests:
+
+	make check
 
  Run all tests:
 
diff --git a/Makefile.am b/Makefile.am
index 1aeca791e..6a248e602 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,6 +40,7 @@ sbin_PROGRAMS =
 dist_usrbin_exec_SCRIPTS =
 systemdsystemunit_DATA =
 ruman1_DATA =
+check_PROGRAMS =
 
 INSTALL_EXEC_HOOKS =
 UNINSTALL_HOOKS =
diff --git a/lib/Makemodule.am b/lib/Makemodule.am
index 064cc9f4e..6a6e9b259 100644
--- a/lib/Makemodule.am
+++ b/lib/Makemodule.am
@@ -34,7 +34,7 @@ if !HAVE_LANGINFO
 libcommon_la_SOURCES += lib/langinfo.c
 endif
 
-noinst_PROGRAMS += \
+check_PROGRAMS += \
 	test_at \
 	test_blkdev \
 	test_canonicalize \
@@ -50,9 +50,9 @@ noinst_PROGRAMS += \
 
 if LINUX
 if HAVE_CPU_SET_T
-noinst_PROGRAMS += test_cpuset
+check_PROGRAMS += test_cpuset
 endif
-noinst_PROGRAMS += \
+check_PROGRAMS += \
 	test_sysfs \
 	test_loopdev
 endif
diff --git a/libblkid/samples/Makemodule.am b/libblkid/samples/Makemodule.am
index f76457a6d..0ffbf1477 100644
--- a/libblkid/samples/Makemodule.am
+++ b/libblkid/samples/Makemodule.am
@@ -1,5 +1,5 @@
 
-noinst_PROGRAMS += \
+check_PROGRAMS += \
 	sample-mkfs \
 	sample-partitions \
 	sample-superblocks \
diff --git a/libblkid/src/Makemodule.am b/libblkid/src/Makemodule.am
index af1764c6f..b168c7c1e 100644
--- a/libblkid/src/Makemodule.am
+++ b/libblkid/src/Makemodule.am
@@ -131,7 +131,7 @@ EXTRA_DIST += \
 	libblkid/src/blkid.sym \
 	libblkid/src/blkid.h.in
 
-noinst_PROGRAMS += \
+check_PROGRAMS += \
 	test_blkid_cache \
 	test_blkid_config \
 	test_blkid_dev \
diff --git a/libmount/src/Makemodule.am b/libmount/src/Makemodule.am
index 211834e7f..8a6b2adf7 100644
--- a/libmount/src/Makemodule.am
+++ b/libmount/src/Makemodule.am
@@ -50,7 +50,7 @@ EXTRA_DIST += \
 	libmount/src/libmount.sym \
 	libmount/src/libmount.h.in
 
-noinst_PROGRAMS += \
+check_PROGRAMS += \
 	test_mount_cache \
 	test_mount_context \
 	test_mount_lock \
diff --git a/libuuid/src/Makemodule.am b/libuuid/src/Makemodule.am
index 2332fe24f..73f1ba957 100644
--- a/libuuid/src/Makemodule.am
+++ b/libuuid/src/Makemodule.am
@@ -1,5 +1,5 @@
 
-noinst_PROGRAMS += test_uuid
+check_PROGRAMS += test_uuid
 test_uuid_SOURCES = libuuid/src/test_uuid.c
 test_uuid_LDADD = libuuid.la $(SOCKET_LIBS)
 test_uuid_CFLAGS = -I$(ul_libuuid_incdir)
diff --git a/login-utils/Makemodule.am b/login-utils/Makemodule.am
index 85a3815ab..41e32aa3e 100644
--- a/login-utils/Makemodule.am
+++ b/login-utils/Makemodule.am
@@ -122,7 +122,7 @@ INSTALL_EXEC_HOOKS += install-exec-hook-vipw
 endif # BUILD_VIPW
 
 
-noinst_PROGRAMS += \
+check_PROGRAMS += \
 	test_islocal \
 	test_logindefs
 
diff --git a/tests/helpers/Makemodule.am b/tests/helpers/Makemodule.am
index 0228cb327..9724dae09 100644
--- a/tests/helpers/Makemodule.am
+++ b/tests/helpers/Makemodule.am
@@ -1,12 +1,12 @@
 
-noinst_PROGRAMS += test_byteswap
+check_PROGRAMS += test_byteswap
 test_byteswap_SOURCES = tests/helpers/test_byteswap.c
 
-noinst_PROGRAMS += test_md5
+check_PROGRAMS += test_md5
 test_md5_SOURCES = tests/helpers/test_md5.c lib/md5.c
 
-noinst_PROGRAMS += test_pathnames
+check_PROGRAMS += test_pathnames
 test_pathnames_SOURCES = tests/helpers/test_pathnames.c
 
-noinst_PROGRAMS += test_sysinfo
+check_PROGRAMS += test_sysinfo
 test_sysinfo_SOURCES = tests/helpers/test_sysinfo.c
-- 
cgit v1.2.3-55-g7522