autotools: cleanup tests to use libcommon.la

This change simplifies future test work.

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/lib/Makemodule.am b/lib/Makemodule.am
index bf24b6bee86e0cf1ac5ef33a7b83ea84839b0542..d73ae01b7e2248975855cfa08a43312abd7266b3 100644 (file)
--- a/lib/Makemodule.am
+++ b/lib/Makemodule.am
@@ -140,6 +140,7 @@ test_mangle_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_MANGLE
 
 test_strutils_SOURCES = lib/strutils.c
 test_strutils_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_STRUTILS
+test_strutils_LDADD = $(LDADD) libcommon.la
 
 test_c_strtod_SOURCES = lib/c_strtod.c
 test_c_strtod_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM
@@ -158,7 +159,7 @@ if HAVE_CPU_SET_T
 test_path_SOURCES += lib/cpuset.c
 endif
 test_path_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_PATH
-test_path_LDADD = $(LDADD)
+test_path_LDADD = $(LDADD) libcommon.la
 endif
 endif
 
@@ -174,26 +175,25 @@ endif
 if LINUX
 test_cpuset_SOURCES = lib/cpuset.c
 test_cpuset_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_CPUSET
+test_cpuset_LDADD = $(LDADD) libcommon.la
 
-test_sysfs_SOURCES = lib/sysfs.c lib/path.c lib/fileutils.c lib/buffer.c lib/mbsalign.c
-if HAVE_CPU_SET_T
-test_sysfs_SOURCES += lib/cpuset.c
-endif
+test_sysfs_SOURCES = lib/sysfs.c
 test_sysfs_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_SYSFS
-test_sysfs_LDADD = $(LDADD)
+test_sysfs_LDADD = $(LDADD) libcommon.la
 
-test_procfs_SOURCES = lib/procfs.c lib/path.c lib/fileutils.c lib/strutils.c
-if HAVE_CPU_SET_T
-test_procfs_SOURCES += lib/cpuset.c
-endif
+test_procfs_SOURCES = lib/procfs.c
 test_procfs_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_PROCFS
-test_procfs_LDADD = $(LDADD)
+test_procfs_LDADD = $(LDADD) libcommon.la
 
 test_pager_SOURCES = lib/pager.c
 test_pager_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_PAGER
 
 test_linux_version_SOURCES = lib/linux_version.c
 test_linux_version_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_LINUXVERSION
+
+test_loopdev_SOURCES = lib/loopdev.c
+test_loopdev_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_LOOPDEV
+test_loopdev_LDADD = $(LDADD) libcommon.la
 endif
 
 test_fileeq_SOURCES = lib/fileeq.c
@@ -201,31 +201,26 @@ test_fileeq_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_FILEEQ
 
 test_fileutils_SOURCES = lib/fileutils.c
 test_fileutils_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_FILEUTILS
+test_fileutils_LDADD = $(LDADD) libcommon.la
 
 test_canonicalize_SOURCES = lib/canonicalize.c
 test_canonicalize_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_CANONICALIZE
+test_canonicalize_LDADD = $(LDADD) libcommon.la
 
-test_timeutils_SOURCES = lib/timeutils.c lib/strutils.c
+test_timeutils_SOURCES = lib/timeutils.c
 test_timeutils_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_TIMEUTILS
+test_timeutils_LDADD = $(LDADD) libcommon.la
 
 test_pwdutils_SOURCES = lib/pwdutils.c
 test_pwdutils_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM
 
-test_remove_env_SOURCES = lib/env.c lib/strv.c lib/strutils.c
-test_remove_env_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM
+test_remove_env_SOURCES = lib/env.c
+test_remove_env_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_ENV
+test_remove_env_LDADD = $(LDADD) libcommon.la
 
-test_buffer_SOURCES = lib/buffer.c lib/mbsalign.c
+test_buffer_SOURCES = lib/buffer.c
 test_buffer_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_BUFFER
-
-if LINUX
-test_loopdev_SOURCES = lib/loopdev.c \
-                      lib/blkdev.c \
-                      lib/linux_version.c \
-                      $(test_sysfs_SOURCES) \
-                      $(test_canonicalize_SOURCES)
-test_loopdev_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_LOOPDEV
-endif
-
+test_buffer_LDADD = $(LDADD) libcommon.la
 
 test_logindefs_SOURCES = lib/logindefs.c
 test_logindefs_CPPFLAGS = -DTEST_PROGRAM $(AM_CPPFLAGS)

diff --git a/lib/env.c b/lib/env.c
index cdd8f8c58769a4affa481bab1c46d51aa549500f..039fad0dc57f7902fe6dac8b6b1e851f2ee06ee2 100644 (file)
--- a/lib/env.c
+++ b/lib/env.c
@@ -280,7 +280,7 @@ return secure_getenv(arg);
 #endif
 }
 
-#ifdef TEST_PROGRAM
+#ifdef TEST_PROGRAM_ENV
 int main(void)
 {
        char *const *bad;