diff options
| author | Ruediger Meier | 2016-04-06 12:30:18 +0200 |
|---|---|---|
| committer | Karel Zak | 2016-04-13 12:29:16 +0200 |
| commit | c3f323cb2cb6076ac3a509fb240cf4d7b97199eb (patch) | |
| tree | 573ea24978e1e53e7e8b6baf4051c6ad7742545b /tests/ts/cramfs | |
| parent | tests: test_md5 prints md5sum only (diff) | |
| download | kernel-qcow2-util-linux-c3f323cb2cb6076ac3a509fb240cf4d7b97199eb.tar.gz kernel-qcow2-util-linux-c3f323cb2cb6076ac3a509fb240cf4d7b97199eb.tar.xz kernel-qcow2-util-linux-c3f323cb2cb6076ac3a509fb240cf4d7b97199eb.zip | |
tests: don't depend on GNU md5sum
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 | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/ts/cramfs/fsck-endianness b/tests/ts/cramfs/fsck-endianness index d6d2ae39e..db287f9d0 100755 --- a/tests/ts/cramfs/fsck-endianness +++ b/tests/ts/cramfs/fsck-endianness @@ -23,6 +23,7 @@ ts_init "$*" ts_check_test_command "$TS_CMD_MKCRAMFS" ts_check_test_command "$TS_CMD_FSCKCRAMFS" +ts_check_test_command "$TS_HELPER_MD5" ts_skip_nonroot @@ -45,7 +46,7 @@ test_image() { $TS_CMD_MKCRAMFS -N "$TO_ENDIANNESS" -b 4096 "$IMAGE_DATA" \ "$IMAGE_CREATED" >> $TS_OUTPUT 2>&1 - md5sum $IMAGE_CREATED | cut -d" " -f1 >> $TS_OUTPUT + "$TS_HELPER_MD5" < "$IMAGE_CREATED" >> $TS_OUTPUT rm "$IMAGE_CREATED" } diff --git a/tests/ts/cramfs/mkfs b/tests/ts/cramfs/mkfs index cf6bcd699..d24b41833 100755 --- a/tests/ts/cramfs/mkfs +++ b/tests/ts/cramfs/mkfs @@ -24,6 +24,7 @@ ts_init "$*" ts_check_test_command "$TS_CMD_MKCRAMFS" ts_check_test_command "$TS_CMD_MOUNT" ts_check_test_command "$TS_CMD_UMOUNT" +ts_check_test_command "$TS_HELPER_MD5" ts_skip_nonroot ts_check_losetup @@ -75,7 +76,7 @@ $TS_CMD_MKCRAMFS -n $LABEL $IMAGE_SRC $IMAGE_PATH >> $TS_OUTPUT 2>&1 ts_cd "$TS_OUTDIR" ts_log "count MD5 from the image" -MD5_OUT=$(md5sum "$IMAGE_NAME" | awk '{printf $1}') >> $TS_OUTPUT 2>&1 +MD5_OUT=$("$TS_HELPER_MD5" < "$IMAGE_NAME") >> $TS_OUTPUT 2>&1 if [ "$MD5_EXP" != "$MD5_OUT" -a "$MD5_EXP" != "unknown" ]; then ts_log "is $MD5_OUT, should be $MD5_EXP" fi |