From: Ruediger Meier Date: Sat, 17 May 2014 10:55:27 +0000 (+0200) Subject: tests, fix cramfs for systems with certain page sizes X-Git-Tag: v2.25-rc1~121^2~10 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa264ba5847f82f5eb89628594e1af56f576b0c3;p=thirdparty%2Futil-linux.git tests, fix cramfs for systems with certain page sizes This is only a partial fix to get comparable image md5sums. fsck.cramfs still fails if system page size > 4096 Signed-off-by: Ruediger Meier --- diff --git a/tests/ts/cramfs/fsck-endianness b/tests/ts/cramfs/fsck-endianness index 33bd18b2aa..9330b7d2e3 100755 --- a/tests/ts/cramfs/fsck-endianness +++ b/tests/ts/cramfs/fsck-endianness @@ -47,7 +47,8 @@ test_image() { $TS_CMD_FSCKCRAMFS -v -x $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" "$IMAGE_DATA" "$IMAGE_CREATED" 2>&1 >> $TS_OUTPUT + $TS_CMD_MKCRAMFS -N "$TO_ENDIANNESS" -b 4096 "$IMAGE_DATA" \ + "$IMAGE_CREATED" >> $TS_OUTPUT 2>&1 md5sum $IMAGE_CREATED | cut -d" " -f1 >> $TS_OUTPUT diff --git a/tests/ts/cramfs/mkfs-endianness b/tests/ts/cramfs/mkfs-endianness index c7df720b64..34d6bbfccc 100755 --- a/tests/ts/cramfs/mkfs-endianness +++ b/tests/ts/cramfs/mkfs-endianness @@ -34,14 +34,16 @@ test_image() { local TO_ENDIANNESS="$1"; shift ts_log "create $TO_ENDIANNESS endian" - $TS_CMD_MKCRAMFS -N "$TO_ENDIANNESS" "$IMAGE_DATA" "$IMAGE_CREATED" 2>&1 >> $TS_OUTPUT + $TS_CMD_MKCRAMFS -N "$TO_ENDIANNESS" -b 4096 "$IMAGE_DATA" \ + "$IMAGE_CREATED" >> $TS_OUTPUT 2>&1 md5sum $IMAGE_CREATED | cut -d" " -f1 >> $TS_OUTPUT rm "$IMAGE_CREATED" } -#generate test data +#generate test data, must be owner root +rm -rf "$IMAGE_DATA" mkdir -p $IMAGE_DATA/dirA/dirB yes "Testing cramfs 1234567890 Endianness check 1234567890 Endianness check" \ | dd of=$IMAGE_DATA/dirA/dirB/a bs=512 count=1 &> /dev/null