libmount: fix Makefile and tests

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

diff --git a/shlibs/mount/src/Makefile.am b/shlibs/mount/src/Makefile.am
index 2d7e93b33612d01b6d0a34ed707a6e38dc24ba89..261effa13fbc668d969b65ddcc1127dd76559214 100644 (file)
--- a/shlibs/mount/src/Makefile.am
+++ b/shlibs/mount/src/Makefile.am
@@ -58,7 +58,7 @@ tests = test_version test_cache test_optstr test_lock \
                  test_tab test_utils test_tab_update
 
 tests: all $(tests)
-test_%: %.c
+test_%: %.c all
        $(COMPILE) -DTEST_PROGRAM $< .libs/libmount.a \
                $(ul_libblkid_builddir)/.libs/libblkid.a -o $@ \
                $(TESTS_LIBS)

diff --git a/tests/ts/libmount/update b/tests/ts/libmount/update
index c3d26e3e95578c155fcf4dd4703c27c3ef601549..7de942518b012be41c694e2bb2f8e8f9eb4c1794 100755 (executable)
--- a/tests/ts/libmount/update
+++ b/tests/ts/libmount/update
@@ -54,11 +54,4 @@ $TESTPROG --remove /mnt/gogo
 cp $LIBMOUNT_MTAB $TS_OUTPUT   # save the mtab aside
 ts_finalize_subtest            # checks the mtab
 
-ts_init_subtest "fstab-add"
-$TESTPROG --add-fstab /dev/sda1 /mnt/foo ext3 "rw,bbb,ccc,fff=FFF,ddd,noexec" 1 2
-$TESTPROG --add-fstab /dev/sda2 /mnt/bar auto "defaults" 1 2
-$TESTPROG --add-fstab /dev/sda3 /mnt/bar auto "rw,context=\"some,selinux,junk\",noatime" 1 2
-cp $LIBMOUNT_FSTAB $TS_OUTPUT  # save the fstab aside
-ts_finalize_subtest            # checks the fstab
-
 ts_finalize