summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarel Zak <kzak@redhat.com>2010-11-08 11:12:35 +0100
committerKarel Zak <kzak@redhat.com>2011-01-03 12:28:46 +0100
commitd5c04a47af79c687ea81e0c6da14d63939aa2994 (patch)
tree5842b9109c1e37c0e5d5c2695131345473c3e200
parent70bf97aed95539feb2496f09316709d06b76b33d (diff)
downloadutil-linux-old-d5c04a47af79c687ea81e0c6da14d63939aa2994.tar.gz
libmount: fix Makefile and tests
Signed-off-by: Karel Zak <kzak@redhat.com>
-rw-r--r--shlibs/mount/src/Makefile.am2
-rwxr-xr-xtests/ts/libmount/update7
2 files changed, 1 insertions, 8 deletions
diff --git a/shlibs/mount/src/Makefile.am b/shlibs/mount/src/Makefile.am
index 2d7e93b3..261effa1 100644
--- 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 c3d26e3e..7de94251 100755
--- 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