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>

diff --git a/tests/ts/cramfs/fsck-endianness b/tests/ts/cramfs/fsck-endianness
index 33bd18b2aaafbdcc8b5aa22d6f1cca47bba62578..9330b7d2e3ce6e08f3fbff27481a02fb6b2f68e9 100755 (executable)
--- 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 c7df720b64fe92036eb1fde2038a2231153189bc..34d6bbfccc16828a3fc23c67ae66b43c17dba692 100755 (executable)
--- 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