diff options
| author | Ruediger Meier | 2014-05-17 12:55:27 +0200 |
|---|---|---|
| committer | Ruediger Meier | 2014-05-18 14:07:33 +0200 |
| commit | fa264ba5847f82f5eb89628594e1af56f576b0c3 (patch) | |
| tree | 0abde934f0738e9bd38e4fce9f76029532767431 /tests/ts/cramfs | |
| parent | Merge branch 'tests-mount' of https://github.com/rudimeier/util-linux (diff) | |
| download | kernel-qcow2-util-linux-fa264ba5847f82f5eb89628594e1af56f576b0c3.tar.gz kernel-qcow2-util-linux-fa264ba5847f82f5eb89628594e1af56f576b0c3.tar.xz kernel-qcow2-util-linux-fa264ba5847f82f5eb89628594e1af56f576b0c3.zip | |
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 <ruediger.meier@ga-group.nl>
Diffstat (limited to 'tests/ts/cramfs')
| -rwxr-xr-x | tests/ts/cramfs/fsck-endianness | 3 | ||||
| -rwxr-xr-x | tests/ts/cramfs/mkfs-endianness | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/tests/ts/cramfs/fsck-endianness b/tests/ts/cramfs/fsck-endianness index 33bd18b2a..9330b7d2e 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 c7df720b6..34d6bbfcc 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 |