tests: remove USE_LIBMOUNT_FORCE_MOUNTINFO

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

diff --git a/libmount/src/version.c b/libmount/src/version.c
index 2d30954bbdaddba99ce0b9349f0ef57bfc1c73d5..76e137f321ec9b75dd937e3557b1e8f74053aa21 100644 (file)
--- a/libmount/src/version.c
+++ b/libmount/src/version.c
@@ -28,8 +28,8 @@ static const char *lib_features[] = {
 #ifdef HAVE_BTRFS_SUPPORT
        "btrfs",
 #endif
-#ifdef USE_LIBMOUNT_FORCE_MOUNTINFO
-       "force-mountinfo",
+#ifdef USE_LIBMOUNT_SUPPORT_MTAB
+       "mtab",
 #endif
 #if !defined(NDEBUG)
        "assert",       /* libc assert.h stuff */

diff --git a/tests/ts/libmount/context b/tests/ts/libmount/context
index d0d1c3d5f8ebf51746eac78f5eccb164b57be79d..2566ccb5385a81c29e8ac160c572847348bb714c 100755 (executable)
--- a/tests/ts/libmount/context
+++ b/tests/ts/libmount/context
@@ -35,9 +35,10 @@ $TS_CMD_UMOUNT $MOUNTPOINT &> /dev/null
 ts_scsi_debug_init dev_size_mb=100
 DEVNAME=$(basename $TS_DEVICE)
 
-grep -q '#define USE_LIBMOUNT_FORCE_MOUNTINFO' ${top_builddir}/config.h
+MOUNTINFO_ONLY=yes
+grep -q '#define USE_LIBMOUNT_SUPPORT_MTAB' ${top_builddir}/config.h
 if [ $? == 0 ]; then
-       MOUNTINFO_ONLY=yes
+       MOUNTINFO_ONLY=no
 fi
 
 ts_log "Create partitions"

diff --git a/tests/ts/libmount/context-py b/tests/ts/libmount/context-py
index c8b7b4effe69e9f174dad3eb9e7dc09b8cb9b2c2..5188309be448c9cb653216f54933d4c2d2e4b8f8 100755 (executable)
--- a/tests/ts/libmount/context-py
+++ b/tests/ts/libmount/context-py
@@ -37,9 +37,10 @@ $TS_CMD_UMOUNT $MOUNTPOINT &> /dev/null
 ts_scsi_debug_init dev_size_mb=100
 DEVNAME=$(basename $TS_DEVICE)
 
-grep -q '#define USE_LIBMOUNT_FORCE_MOUNTINFO' ${top_builddir}/config.h
+MOUNTINFO_ONLY=yes
+grep -q '#define USE_LIBMOUNT_SUPPORT_MTAB' ${top_builddir}/config.h
 if [ $? == 0 ]; then
-       MOUNTINFO_ONLY=yes
+       MOUNTINFO_ONLY=no
 fi
 
 ts_log "Create partitions"