From e8f7acb0d34ed0eeb4262dcf6c54208979616b06 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Wed, 4 Jan 2017 11:44:37 +0100 Subject: [PATCH] lib: use unique ifdefs for tests Let's use unique TEST_PROGRAM_ ifdefs to make build system more robust. Signed-off-by: Karel Zak --- lib/Makemodule.am | 22 +++++++++++----------- lib/blkdev.c | 2 +- lib/colors.c | 4 ++-- lib/cpuset.c | 2 +- lib/fileutils.c | 2 +- lib/ismounted.c | 2 +- lib/linux_version.c | 2 +- lib/mangle.c | 4 ++-- lib/pager.c | 4 ++-- lib/procutils.c | 4 ++-- lib/randutils.c | 4 ++-- lib/strutils.c | 4 ++-- lib/sysfs.c | 2 +- lib/timeutils.c | 2 +- lib/ttyutils.c | 4 ++-- 15 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lib/Makemodule.am b/lib/Makemodule.am index f5f7d0bbf..4bc6d5f02 100644 --- a/lib/Makemodule.am +++ b/lib/Makemodule.am @@ -84,7 +84,7 @@ check_PROGRAMS += test_procutils endif test_ttyutils_SOURCES = lib/ttyutils.c -test_ttyutils_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM +test_ttyutils_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_TTYUTILS test_ttyutils_LDADD = $(LDADD) libcommon.la test_blkdev_SOURCES = lib/blkdev.c @@ -92,44 +92,44 @@ test_blkdev_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_BLKDEV test_blkdev_LDADD = $(LDADD) libcommon.la test_ismounted_SOURCES = lib/ismounted.c -test_ismounted_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM +test_ismounted_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_ISMOUNTED test_ismounted_LDADD = $(LDADD) libcommon.la test_mangle_SOURCES = lib/mangle.c -test_mangle_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM +test_mangle_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_MANGLE test_strutils_SOURCES = lib/strutils.c -test_strutils_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM +test_strutils_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_STRUTILS test_colors_SOURCES = lib/colors.c lib/color-names.c -test_colors_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM $(TINFO_CFLAGS) +test_colors_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_COLORS $(TINFO_CFLAGS) test_colors_LDADD = $(LDADD) $(TINFO_LIBS) test_randutils_SOURCES = lib/randutils.c -test_randutils_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM +test_randutils_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_RANDUTILS if HAVE_OPENAT test_procutils_SOURCES = lib/procutils.c -test_procutils_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM +test_procutils_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_PROCUTILS endif if LINUX test_cpuset_SOURCES = lib/cpuset.c -test_cpuset_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM +test_cpuset_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_CPUSET test_sysfs_SOURCES = lib/sysfs.c test_sysfs_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_SYSFS test_sysfs_LDADD = $(LDADD) libcommon.la test_pager_SOURCES = lib/pager.c -test_pager_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM +test_pager_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_PAGER test_linux_version_SOURCES = lib/linux_version.c -test_linux_version_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM +test_linux_version_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_LINUXVERSION endif test_fileutils_SOURCES = lib/fileutils.c -test_fileutils_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM +test_fileutils_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_FILEUTILS test_canonicalize_SOURCES = lib/canonicalize.c test_canonicalize_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_CANONICALIZE diff --git a/lib/blkdev.c b/lib/blkdev.c index 077d92697..2b62f09d8 100644 --- a/lib/blkdev.c +++ b/lib/blkdev.c @@ -406,4 +406,4 @@ main(int argc, char **argv) return EXIT_SUCCESS; } -#endif /* TEST_PROGRAM */ +#endif /* TEST_PROGRAM_BLKDEV */ diff --git a/lib/colors.c b/lib/colors.c index e5a27ba25..99e2228ed 100644 --- a/lib/colors.c +++ b/lib/colors.c @@ -822,7 +822,7 @@ int colormode_or_err(const char *str, const char *errmsg) return colormode; } -#ifdef TEST_PROGRAM +#ifdef TEST_PROGRAM_COLORS # include int main(int argc, char *argv[]) { @@ -876,5 +876,5 @@ int main(int argc, char *argv[]) return EXIT_SUCCESS; } -#endif +#endif /* TEST_PROGRAM_COLORS */ diff --git a/lib/cpuset.c b/lib/cpuset.c index 7445ab437..89cd0f14c 100644 --- a/lib/cpuset.c +++ b/lib/cpuset.c @@ -321,7 +321,7 @@ int cpulist_parse(const char *str, cpu_set_t *set, size_t setsize, int fail) return 0; } -#ifdef TEST_PROGRAM +#ifdef TEST_PROGRAM_CPUSET #include diff --git a/lib/fileutils.c b/lib/fileutils.c index 15cc92583..822ca9676 100644 --- a/lib/fileutils.c +++ b/lib/fileutils.c @@ -124,7 +124,7 @@ int get_fd_tabsize(void) return m; } -#ifdef TEST_PROGRAM +#ifdef TEST_PROGRAM_FILEUTILS int main(void) { FILE *f; diff --git a/lib/ismounted.c b/lib/ismounted.c index dd2d356c4..682104d51 100644 --- a/lib/ismounted.c +++ b/lib/ismounted.c @@ -369,7 +369,7 @@ int is_mounted(const char *file) return mount_flags & MF_MOUNTED; } -#ifdef TEST_PROGRAM +#ifdef TEST_PROGRAM_ISMOUNTED int main(int argc, char **argv) { int flags = 0; diff --git a/lib/linux_version.c b/lib/linux_version.c index 7174a24f1..13580bc21 100644 --- a/lib/linux_version.c +++ b/lib/linux_version.c @@ -23,7 +23,7 @@ int get_linux_version (void) return kver = KERNEL_VERSION(x, y, z); } -#ifdef TEST_PROGRAM +#ifdef TEST_PROGRAM_LINUXVERSION # include int main(int argc, char *argv[]) { diff --git a/lib/mangle.c b/lib/mangle.c index 5236e97bf..354d3359f 100644 --- a/lib/mangle.c +++ b/lib/mangle.c @@ -127,7 +127,7 @@ char *unmangle(const char *s, char **end) return buf; } -#ifdef TEST_PROGRAM +#ifdef TEST_PROGRAM_MANGLE #include int main(int argc, char *argv[]) { @@ -163,4 +163,4 @@ int main(int argc, char *argv[]) return EXIT_SUCCESS; } -#endif /* TEST_PROGRAM */ +#endif /* TEST_PROGRAM_MANGLE */ diff --git a/lib/pager.c b/lib/pager.c index 114b3f7a7..24284d605 100644 --- a/lib/pager.c +++ b/lib/pager.c @@ -260,7 +260,7 @@ void pager_close(void) memset(&pager_process, 0, sizeof(pager_process)); } -#ifdef TEST_PROGRAM +#ifdef TEST_PROGRAM_PAGER #define MAX 255 @@ -274,4 +274,4 @@ int main(int argc __attribute__ ((__unused__)), printf("%d\n", i); return EXIT_SUCCESS; } -#endif /* TEST_PROGRAM */ +#endif /* TEST_PROGRAM_PAGER */ diff --git a/lib/procutils.c b/lib/procutils.c index 16d1897b4..8fb5d5c00 100644 --- a/lib/procutils.c +++ b/lib/procutils.c @@ -241,7 +241,7 @@ int proc_next_pid(struct proc_processes *ps, pid_t *pid) return 0; } -#ifdef TEST_PROGRAM +#ifdef TEST_PROGRAM_PROCUTILS static int test_tasks(int argc, char *argv[]) { @@ -305,4 +305,4 @@ int main(int argc, char *argv[]) return EXIT_FAILURE; } -#endif /* TEST_PROGRAM */ +#endif /* TEST_PROGRAM_PROCUTILS */ diff --git a/lib/randutils.c b/lib/randutils.c index 8defe744c..daf046005 100644 --- a/lib/randutils.c +++ b/lib/randutils.c @@ -173,7 +173,7 @@ const char *random_tell_source(void) return _("libc pseudo-random functions"); } -#ifdef TEST_PROGRAM +#ifdef TEST_PROGRAM_RANDUTILS int main(int argc __attribute__ ((__unused__)), char *argv[] __attribute__ ((__unused__))) { @@ -187,4 +187,4 @@ int main(int argc __attribute__ ((__unused__)), return EXIT_SUCCESS; } -#endif /* TEST_PROGRAM */ +#endif /* TEST_PROGRAM_RANDUTILS */ diff --git a/lib/strutils.c b/lib/strutils.c index 8a52be048..d3daa369d 100644 --- a/lib/strutils.c +++ b/lib/strutils.c @@ -959,7 +959,7 @@ int skip_fline(FILE *fp) } while (1); } -#ifdef TEST_PROGRAM +#ifdef TEST_PROGRAM_STRUTILS static int test_strutils_sizes(int argc, char *argv[]) { @@ -1011,4 +1011,4 @@ int main(int argc, char *argv[]) return EXIT_FAILURE; } -#endif /* TEST_PROGRAM */ +#endif /* TEST_PROGRAM_STRUTILS */ diff --git a/lib/sysfs.c b/lib/sysfs.c index b52446c20..9c66a611a 100644 --- a/lib/sysfs.c +++ b/lib/sysfs.c @@ -1097,4 +1097,4 @@ int main(int argc, char *argv[]) sysfs_deinit(&cxt); return EXIT_SUCCESS; } -#endif +#endif /* TEST_PROGRAM_SYSFS */ diff --git a/lib/timeutils.c b/lib/timeutils.c index 608e6bdef..ea5c0aad8 100644 --- a/lib/timeutils.c +++ b/lib/timeutils.c @@ -494,4 +494,4 @@ int main(int argc, char *argv[]) return EXIT_SUCCESS; } -#endif /* TEST_PROGRAM */ +#endif /* TEST_PROGRAM_TIMEUTILS */ diff --git a/lib/ttyutils.c b/lib/ttyutils.c index dd3acaba5..613e5af65 100644 --- a/lib/ttyutils.c +++ b/lib/ttyutils.c @@ -88,7 +88,7 @@ int get_terminal_name(const char **path, } -#ifdef TEST_PROGRAM +#ifdef TEST_PROGRAM_TTYUTILS # include int main(void) { @@ -103,4 +103,4 @@ int main(void) return EXIT_SUCCESS; } -#endif +#endif /* TEST_PROGRAM_TTYUTILS */