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 | |
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')
-rwxr-xr-x | tests/ts/cramfs/fsck-endianness | 3 | ||||
-rwxr-xr-x | tests/ts/cramfs/mkfs | 3 | ||||
-rwxr-xr-x | tests/ts/fdisk/mbr-dos-mode | 1 | ||||
-rwxr-xr-x | tests/ts/fdisk/mbr-nondos-mode | 1 | ||||
-rwxr-xr-x | tests/ts/fdisk/oddinput | 1 | ||||
-rwxr-xr-x | tests/ts/fdisk/sunlabel | 1 | ||||
-rwxr-xr-x | tests/ts/misc/rev | 5 | ||||
-rwxr-xr-x | tests/ts/mount/rlimit | 3 | ||||
-rwxr-xr-x | tests/ts/sfdisk/movedata | 5 |
9 files changed, 16 insertions, 7 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 diff --git a/tests/ts/fdisk/mbr-dos-mode b/tests/ts/fdisk/mbr-dos-mode index 4fad8da77..219df2f8e 100755 --- a/tests/ts/fdisk/mbr-dos-mode +++ b/tests/ts/fdisk/mbr-dos-mode @@ -23,6 +23,7 @@ TS_DESC="MBR - dos mode" ts_init "$*" ts_check_test_command "$TS_CMD_FDISK" +ts_check_test_command "$TS_HELPER_MD5" FDISK_CMD_INIT="x\ni\n0x1\nr\n" FDISK_CMD_WRITE_CLOSE="w\nq\n" diff --git a/tests/ts/fdisk/mbr-nondos-mode b/tests/ts/fdisk/mbr-nondos-mode index f39b5e0f0..e01b060f3 100755 --- a/tests/ts/fdisk/mbr-nondos-mode +++ b/tests/ts/fdisk/mbr-nondos-mode @@ -21,6 +21,7 @@ TS_DESC="MBR - non-dos mode" ts_init "$*" ts_check_test_command "$TS_CMD_FDISK" +ts_check_test_command "$TS_HELPER_MD5" # cmd to changes system id to 0x1 FDISK_CMD_INIT="x\ni\n0x1\nr\n" diff --git a/tests/ts/fdisk/oddinput b/tests/ts/fdisk/oddinput index 6625d2583..067924264 100755 --- a/tests/ts/fdisk/oddinput +++ b/tests/ts/fdisk/oddinput @@ -21,6 +21,7 @@ TS_DESC="invalid input tests" ts_init "$*" ts_check_test_command "$TS_CMD_FDISK" +ts_check_test_command "$TS_HELPER_MD5" #set -x diff --git a/tests/ts/fdisk/sunlabel b/tests/ts/fdisk/sunlabel index 5bfbb4f4c..d6b103366 100755 --- a/tests/ts/fdisk/sunlabel +++ b/tests/ts/fdisk/sunlabel @@ -21,6 +21,7 @@ TS_DESC="sunlabel tests" ts_init "$*" ts_check_test_command "$TS_CMD_FDISK" +ts_check_test_command "$TS_HELPER_MD5" FDISK_CMD_INIT="s\n" # create new sunlabel FDISK_CMD_WRITE_CLOSE="w\nq\n" diff --git a/tests/ts/misc/rev b/tests/ts/misc/rev index a3d45e6a9..3a541ac04 100755 --- a/tests/ts/misc/rev +++ b/tests/ts/misc/rev @@ -19,11 +19,12 @@ TS_DESC="rev" ts_init "$*" ts_check_test_command "$TS_CMD_REV" +ts_check_test_command "$TS_HELPER_MD5" -for I in {0..512}; do printf "%s " {a..z}; done | md5sum >> $TS_OUTPUT 2>&1 +for I in {0..512}; do printf "%s " {a..z}; done | "$TS_HELPER_MD5" >> $TS_OUTPUT 2>&1 for I in {0..512}; do printf "%s " {a..z}; done | \ - $TS_CMD_REV | md5sum >> $TS_OUTPUT 2>&1 + $TS_CMD_REV | "$TS_HELPER_MD5" >> $TS_OUTPUT 2>&1 printf "abc\n123" | $TS_CMD_REV >> $TS_OUTPUT 2>&1 diff --git a/tests/ts/mount/rlimit b/tests/ts/mount/rlimit index 846908400..d6a64ec75 100755 --- a/tests/ts/mount/rlimit +++ b/tests/ts/mount/rlimit @@ -31,6 +31,7 @@ ts_init "$*" 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 @@ -41,7 +42,7 @@ ts_check_prog "mkfs.ext3" function mtab_checksum() { - md5sum /etc/mtab | awk '{printf $1}' + "$TS_HELPER_MD5" < /etc/mtab } ts_device_init diff --git a/tests/ts/sfdisk/movedata b/tests/ts/sfdisk/movedata index d37f72a4f..64c7371a4 100755 --- a/tests/ts/sfdisk/movedata +++ b/tests/ts/sfdisk/movedata @@ -22,6 +22,7 @@ TS_DESC="movedata" ts_init "$*" ts_check_test_command "$TS_CMD_SFDISK" +ts_check_test_command "$TS_HELPER_MD5" ts_skip_nonroot ts_check_prog "mkfs.ext4" @@ -35,11 +36,11 @@ udevadm settle mkfs.ext4 ${TS_DEVICE}1 &> /dev/null udevadm settle -CHECKSUM=$(md5sum ${TS_DEVICE}1 | awk '{print $1}') +CHECKSUM=$("$TS_HELPER_MD5" < "${TS_DEVICE}1") function checksum() { local dev="$1" - CHECK=$(md5sum ${dev} | awk '{print $1}') + CHECK=$("$TS_HELPER_MD5" < "${dev}") if [ "$CHECKSUM" != "$CHECK" ]; then echo "Checksum does not match!" >> $TS_OUTPUT fi |