lib: add test_ismounted for regression test

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

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 37205dcd686ce319e271dde2b6606a9ae54ffa2e..cd4871aa367de45ceff229a62a96a7d7643f30ad 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,13 +1,15 @@
 include $(top_srcdir)/config/include-Makefile.am
 
-noinst_PROGRAMS = test_blkdev
+noinst_PROGRAMS = test_blkdev test_ismounted
 
-test_blkdev_SOURCES =  $(top_srcdir)/lib/blkdev.c
+test_blkdev_SOURCES = blkdev.c
+test_ismounted_SOURCES = ismounted.c
 
 if LINUX
-test_blkdev_SOURCES += $(top_srcdir)/lib/linux_version.c
+test_blkdev_SOURCES += linux_version.c
 endif
 
-test_blkdev_CFLAGS = -DMAIN_TEST_BLKDEV
+test_blkdev_CFLAGS = -DTEST_PROGRAM
+test_ismounted_CFLAGS = -DTEST_PROGRAM
 
 

diff --git a/lib/blkdev.c b/lib/blkdev.c
index 79a366ca937d21cc33a081405edd4374fdbe3986..7c6c7bab4b7083be0eea0e345a9282f40981ee61 100644 (file)
--- a/lib/blkdev.c
+++ b/lib/blkdev.c
@@ -107,7 +107,7 @@ blkdev_get_sector_size(int fd, int *sector_size)
 }
 
 
-#ifdef MAIN_TEST_BLKDEV
+#ifdef TEST_PROGRAM
 #include <stdio.h>
 #include <stdlib.h>
 #include <fcntl.h>

diff --git a/lib/ismounted.c b/lib/ismounted.c
index 4c164a9546b3c595f641717021c8cef3ea9f4b7e..79a1df6a198ff0f88ffda7b625751ef0c740babd 100644 (file)
--- a/lib/ismounted.c
+++ b/lib/ismounted.c
@@ -185,7 +185,7 @@ int is_mounted(const char *file)
        return mount_flags;
 }
 
-#ifdef DEBUG
+#ifdef TEST_PROGRAM
 int main(int argc, char **argv)
 {
        if (argc < 2) {