summaryrefslogtreecommitdiffstats
path: root/tests/ts/cramfs
diff options
context:
space:
mode:
authorRuediger Meier2014-05-19 12:57:59 +0200
committerRuediger Meier2014-05-19 15:07:17 +0200
commit2d317f117b54f6734a45749e87b31ec4ab175288 (patch)
tree5609b5ba8c3cc1fc3f1ad1014e05b35a55608b7a /tests/ts/cramfs
parenttests: fix fsck.cramfs for systems with certain page sizes (diff)
downloadkernel-qcow2-util-linux-2d317f117b54f6734a45749e87b31ec4ab175288.tar.gz
kernel-qcow2-util-linux-2d317f117b54f6734a45749e87b31ec4ab175288.tar.xz
kernel-qcow2-util-linux-2d317f117b54f6734a45749e87b31ec4ab175288.zip
fsck.cramfs: refactor option -x/--extract
We want to clean it up to compile it later per default (not only if defined INCLUDE_FS_TESTS). - Rename option --destination to --extract. - DIR argument is now optional because we want to keep the use case "test uncompression without writing files" ... but we don't want it always. - Remove shortopt -x because shortopts with optional args are evil. Changing the cmd interface is no compatibility issue here because all affected options errored out per default in past. Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
Diffstat (limited to 'tests/ts/cramfs')
-rwxr-xr-xtests/ts/cramfs/fsck-endianness5
1 files changed, 1 insertions, 4 deletions
diff --git a/tests/ts/cramfs/fsck-endianness b/tests/ts/cramfs/fsck-endianness
index 0ebe54470..87addef76 100755
--- a/tests/ts/cramfs/fsck-endianness
+++ b/tests/ts/cramfs/fsck-endianness
@@ -28,9 +28,6 @@ ts_skip_nonroot
set -o pipefail
-($TS_CMD_FSCKCRAMFS -x TEST_X_FLAG 2>&1 || true) \
- | grep -q "compiled without -x support" && ts_skip "fsck: compiled without -x support"
-
IMAGE_LITTLE="$TS_SELF/cramfs-little.img" #Known good little endian image
IMAGE_BIG="$TS_SELF/cramfs-big.img" #Known good big endian image
@@ -44,7 +41,7 @@ test_image() {
rm -rf "$IMAGE_DATA"
ts_log "extract from $FROM_ENDIANNESS endian"
- $TS_CMD_FSCKCRAMFS -v -b 4096 -x $IMAGE_DATA $FROM_IMAGE | head -n1 | cut -d" " -f4 2>&1 >> $TS_OUTPUT
+ $TS_CMD_FSCKCRAMFS -v -b 4096 --extract=$IMAGE_DATA $FROM_IMAGE | head -n1 | cut -d" " -f4 2>&1 >> $TS_OUTPUT
ts_log "create $TO_ENDIANNESS endian"
$TS_CMD_MKCRAMFS -N "$TO_ENDIANNESS" -b 4096 "$IMAGE_DATA" \