tests: don't depend on GNU md5sum

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>

diff --git a/.travis-functions.sh b/.travis-functions.sh
index fb58df21382ec45103ae426957d8b75b8b7faee9..2b369f1b0d42e9fcf4a27fca96cadb9c9a094d50 100755 (executable)
--- a/.travis-functions.sh
+++ b/.travis-functions.sh
@@ -129,7 +129,7 @@ function osx_prepare_check
 
        # symlink minimally needed gnu commands into PATH
        mkdir ~/bin
-       for cmd in md5sum readlink seq truncate find xargs tar sed; do
+       for cmd in readlink seq truncate find xargs tar sed; do
                ln -s /usr/local/bin/g$cmd $HOME/bin/$cmd
        done
        hash -r

diff --git a/tests/expected/misc/rev b/tests/expected/misc/rev
index 41fdf4c13f0f6b0cffb7529f9b40490ed544dea3..638747637957bff74fa87e81c5e2d186b09fa374 100644 (file)
--- a/tests/expected/misc/rev
+++ b/tests/expected/misc/rev
@@ -1,4 +1,4 @@
-53bbf0d98205319cee2ba589e205c68b  -
-35484965b7a2fd45a471c0d80cb9752c  -
+53bbf0d98205319cee2ba589e205c68b
+35484965b7a2fd45a471c0d80cb9752c
 cba
 321
\ No newline at end of file

diff --git a/tests/functions.sh b/tests/functions.sh
index 5246605e06e93182fdda8f8384bce9b49bb87ca2..fe7ce6d7b03a89a3db9a0cb9183e93ddf028ccf9 100644 (file)
--- a/tests/functions.sh
+++ b/tests/functions.sh
@@ -460,7 +460,7 @@ function ts_cleanup_on_exit {
 
 function ts_image_md5sum {
        local img=${1:-"$TS_OUTDIR/${TS_TESTNAME}.img"}
-       echo $(md5sum "$img" | awk '{printf $1}') $(basename "$img")
+       echo $("$TS_HELPER_MD5" < "$img") $(basename "$img")
 }
 
 function ts_image_init {

diff --git a/tests/ts/cramfs/fsck-endianness b/tests/ts/cramfs/fsck-endianness
index d6d2ae39ec6741d786b0928e06bb14914e6c4aea..db287f9d0fb8bdcbe6b7d01c6c31f3e5e2dfd1e9 100755 (executable)
--- 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 cf6bcd699df8068816e670cb468abce390f05691..d24b4183365418242e7606036433359badec6c16 100755 (executable)
--- 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 4fad8da775e9ecab63a40f1405d394cdde637b26..219df2f8e63ede7d23bfa1e3f3403dc375f0fbbf 100755 (executable)
--- 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 f39b5e0f0fcbaf70073ce27133289cfd95ad8637..e01b060f3ac4ffa8eb4125097c14bcd204439fdb 100755 (executable)
--- 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 6625d25830842c438957efa839a3b98569d5f218..06792426494c0960ad3e498decf39a83f4c032bb 100755 (executable)
--- 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 5bfbb4f4c1ed9af0bf1ba8ff76f7a444928961b3..d6b1033669c1f9d3682133cc93eae82152889804 100755 (executable)
--- 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 a3d45e6a9e768b25be3e41fce7c6e3c8023dc5c5..3a541ac045d50860bab85bda9d3844e09eb9b413 100755 (executable)
--- 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 8469084003dad263d68269a17d70d9bf009f69d8..d6a64ec75f7a1168aac0c60bee7ef371888ff34e 100755 (executable)
--- 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 d37f72a4f4ebddb7dfa7e05cc08995184796404f..64c7371a4ca4a059c3e230a4ff756f3e6be867f2 100755 (executable)
--- 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