summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRuediger Meier2014-05-19 13:47:27 +0200
committerRuediger Meier2014-05-19 23:49:22 +0200
commit2c972db4249173344ea91dc907f3229922913439 (patch)
tree449b1c9df42cd810e3cc88954724c11dc1aaf438
parentfsck.cramfs: remove define INCLUDE_FS_TESTS (diff)
downloadkernel-qcow2-util-linux-2c972db4249173344ea91dc907f3229922913439.tar.gz
kernel-qcow2-util-linux-2c972db4249173344ea91dc907f3229922913439.tar.xz
kernel-qcow2-util-linux-2c972db4249173344ea91dc907f3229922913439.zip
tests: remove test_fsck.cramfs (reverts 6c32ae78)
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
-rw-r--r--disk-utils/Makemodule.am5
-rw-r--r--tests/commands.sh2
2 files changed, 1 insertions, 6 deletions
diff --git a/disk-utils/Makemodule.am b/disk-utils/Makemodule.am
index bb1b28389..2ef3edc4f 100644
--- a/disk-utils/Makemodule.am
+++ b/disk-utils/Makemodule.am
@@ -92,11 +92,6 @@ sbin_PROGRAMS += mkfs.cramfs
mkfs_cramfs_SOURCES = disk-utils/mkfs.cramfs.c $(cramfs_common_sources)
mkfs_cramfs_LDADD = $(LDADD) -lz libcommon.la
dist_man_MANS += disk-utils/mkfs.cramfs.8
-
-check_PROGRAMS += test_fsck.cramfs
-test_fsck_cramfs_SOURCES = $(fsck_cramfs_SOURCES)
-test_fsck_cramfs_LDADD = $(fsck_cramfs_LDADD)
-test_fsck_cramfs_CFLAGS = $(AM_CFLAGS) -DINCLUDE_FS_TESTS
endif
if BUILD_FDFORMAT
diff --git a/tests/commands.sh b/tests/commands.sh
index ffc541b3c..b541af0ae 100644
--- a/tests/commands.sh
+++ b/tests/commands.sh
@@ -38,7 +38,7 @@ TS_CMD_EJECT=${TS_CMD_EJECT-"$top_builddir/eject"}
TS_CMD_FALLOCATE=${TS_CMD_FALLOCATE-"$top_builddir/fallocate"}
TS_CMD_FDISK=${TS_CMD_FDISK-"$top_builddir/fdisk"}
TS_CMD_FINDMNT=${TS_CMD_FINDMNT-"$top_builddir/findmnt"}
-TS_CMD_FSCKCRAMFS=${TS_CMD_FSCKCRAMFS:-"$top_builddir/test_fsck.cramfs"}
+TS_CMD_FSCKCRAMFS=${TS_CMD_FSCKCRAMFS:-"$top_builddir/fsck.cramfs"}
TS_CMD_FSCKMINIX=${TS_CMD_FSCKMINIX:-"$top_builddir/fsck.minix"}
TS_CMD_GETOPT=${TS_CMD_GETOPT-"$top_builddir/getopt"}
TS_CMD_HEXDUMP=${TS_CMD_HEXDUMP-"$top_builddir/hexdump"}