ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lib: use unique ifdefs for tests 

Let's use unique TEST_PROGRAM_<NAME> ifdefs to make build system more
robust.

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2017-01-04 11:44:37 +01:00
parent b8ef01a895
commit e8f7acb0d3
15 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/Makemodule.am
View File

@ -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

2
lib/blkdev.c
View File

@ -406,4 +406,4 @@ main(int argc, char **argv)
return EXIT_SUCCESS;
}
#endif /* TEST_PROGRAM */
#endif /* TEST_PROGRAM_BLKDEV */

4
lib/colors.c
View File

@ -822,7 +822,7 @@ int colormode_or_err(const char *str, const char *errmsg)
return colormode;
}
#ifdef TEST_PROGRAM
#ifdef TEST_PROGRAM_COLORS
# include <getopt.h>
int main(int argc, char *argv[])
{
@ -876,5 +876,5 @@ int main(int argc, char *argv[])
return EXIT_SUCCESS;
}
#endif
#endif /* TEST_PROGRAM_COLORS */

2
lib/cpuset.c
View File

@ -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 <getopt.h>

2
lib/fileutils.c
View File

@ -124,7 +124,7 @@ int get_fd_tabsize(void)
return m;
}
#ifdef TEST_PROGRAM
#ifdef TEST_PROGRAM_FILEUTILS
int main(void)
{
FILE *f;

2
lib/ismounted.c
View File

@ -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;

2
lib/linux_version.c
View File

@ -23,7 +23,7 @@ int get_linux_version (void)
return kver = KERNEL_VERSION(x, y, z);
}
#ifdef TEST_PROGRAM
#ifdef TEST_PROGRAM_LINUXVERSION
# include <stdlib.h>
int main(int argc, char *argv[])
{

4
lib/mangle.c
View File

@ -127,7 +127,7 @@ char *unmangle(const char *s, char **end)
return buf;
}
#ifdef TEST_PROGRAM
#ifdef TEST_PROGRAM_MANGLE
#include <errno.h>
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 */

4
lib/pager.c
View File

@ -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 */

4
lib/procutils.c
View File

@ -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 */

4
lib/randutils.c
View File

@ -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 */

4
lib/strutils.c
View File

@ -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 */

2
lib/sysfs.c
View File

@ -1097,4 +1097,4 @@ int main(int argc, char *argv[])
sysfs_deinit(&cxt);
return EXIT_SUCCESS;
}
#endif
#endif /* TEST_PROGRAM_SYSFS */

2
lib/timeutils.c
View File

@ -494,4 +494,4 @@ int main(int argc, char *argv[])
return EXIT_SUCCESS;
}
#endif /* TEST_PROGRAM */
#endif /* TEST_PROGRAM_TIMEUTILS */

4
lib/ttyutils.c
View File

@ -88,7 +88,7 @@ int get_terminal_name(const char **path,
}
#ifdef TEST_PROGRAM
#ifdef TEST_PROGRAM_TTYUTILS
# include <stdlib.h>
int main(void)
{
@ -103,4 +103,4 @@ int main(void)
return EXIT_SUCCESS;
}
#endif
#endif /* TEST_PROGRAM_TTYUTILS */