From: Ruediger Meier Date: Sat, 28 Mar 2015 11:34:43 +0000 (+0100) Subject: tests: fix cramfs/mkfs for BE and different pagesizes X-Git-Tag: v2.27-rc1~283^2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a91e0e6a84bee704f9b4886196de94d6b29165ba;p=thirdparty%2Futil-linux.git tests: fix cramfs/mkfs for BE and different pagesizes Signed-off-by: Ruediger Meier --- diff --git a/tests/expected/cramfs/mkfs b/tests/expected/cramfs/mkfs index 9e62f6e2ac..1c44097c23 100644 --- a/tests/expected/cramfs/mkfs +++ b/tests/expected/cramfs/mkfs @@ -1225,7 +1225,6 @@ fff6015c3b8f791f4027791ac0b5f593 ./dir-063/data.004 create cramfs image count MD5 from the image -a6667acb1cb0685d9eb5b9cd3724766c mkfs-loop.img create loop device from image check the image diff --git a/tests/ts/cramfs/mkfs b/tests/ts/cramfs/mkfs index 5a10ba9976..7c7d690efa 100755 --- a/tests/ts/cramfs/mkfs +++ b/tests/ts/cramfs/mkfs @@ -36,6 +36,18 @@ IMAGE_PATH="$TS_OUTDIR/$IMAGE_NAME" IMAGE_SRC="$TS_OUTDIR/${TS_TESTNAME}-data" LABEL="testCramfs" +BYTE_ORDER=$($TS_HELPER_SYSINFO byte-order) +PAGE_SIZE=$($TS_HELPER_SYSINFO pagesize) +case "${BYTE_ORDER}:${PAGE_SIZE}" in + LE:4096) MD5_EXP="a6667acb1cb0685d9eb5b9cd3724766c" ;; + LE:65536) MD5_EXP="b60133682603b0118592b55f1dba017c" ;; + BE:4096) MD5_EXP="eaf05031dc8ec97c91ba5c773635cc89" ;; + BE:65536) MD5_EXP="5859f87b185b1187fca3b2b00c809c03" ;; + *) echo "warning ${TS_NS}: unknown checksum" \ + "for ${BYTE_ORDER}:${PAGE_SIZE}" + MD5_EXP="unknown" ;; +esac + ts_log "create mountpoint dir" [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT @@ -66,7 +78,10 @@ $TS_CMD_MKCRAMFS -n $LABEL $IMAGE_SRC $IMAGE_PATH 2>&1 >> $TS_OUTPUT ts_cd "$TS_OUTDIR" ts_log "count MD5 from the image" -md5sum $IMAGE_NAME 2>&1 | sort >> $TS_OUTPUT +MD5_OUT=$(md5sum "$IMAGE_NAME" | awk '{printf $1}') >> $TS_OUTPUT 2>&1 +if [ "$MD5_EXP" != "$MD5_OUT" -a "$MD5_EXP" != "unknown" ]; then + ts_log "is $MD5_OUT, should be $MD5_EXP" +fi echo >> $TS_OUTPUT ts_log "create loop device from image"