From 00c78a0a151ce6a0c277c1d6736517759ae77aae Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Wed, 30 May 2012 03:31:16 +0100 Subject: fate: fix md5sum replacement on some systems On systems where the 'md5' command is used, there is a conflict with the md5() shell function in fate-run.sh. Using the 'command' keyword bypasses the shell function for correct behaviour. Signed-off-by: Mans Rullgard --- tests/md5.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/md5.sh b/tests/md5.sh index 16b0281c00..4b95127701 100644 --- a/tests/md5.sh +++ b/tests/md5.sh @@ -2,8 +2,8 @@ if [ X"$(echo | md5sum 2> /dev/null)" != X ]; then do_md5sum() { md5sum -b $1; } -elif [ X"$(echo | md5 2> /dev/null)" != X ]; then - do_md5sum() { md5 $1 | sed 's#MD5 (\(.*\)) = \(.*\)#\2 *\1#'; } +elif [ X"$(echo | command md5 2> /dev/null)" != X ]; then + do_md5sum() { command md5 $1 | sed 's#MD5 (\(.*\)) = \(.*\)#\2 *\1#'; } elif [ -x /sbin/md5 ]; then do_md5sum() { /sbin/md5 -r $1 | sed 's# \**\./# *./#'; } elif openssl version >/dev/null 2>&1; then -- cgit v1.2.3 From 0857e46dd5f6d4d9b9b946492fe0c951485bdbe7 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Wed, 30 May 2012 05:17:50 +0100 Subject: fate: add missing $(TARGET_PATH) to ac3-fixed-encode Signed-off-by: Mans Rullgard --- tests/fate/ac3.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/fate/ac3.mak b/tests/fate/ac3.mak index 5e5d06ab44..4fafb053d8 100644 --- a/tests/fate/ac3.mak +++ b/tests/fate/ac3.mak @@ -48,7 +48,7 @@ fate-eac3-encode: FUZZ = 3 FATE_AC3 += fate-ac3-fixed-encode fate-ac3-fixed-encode: tests/data/asynth-44100-2.wav -fate-ac3-fixed-encode: SRC = tests/data/asynth-44100-2.wav +fate-ac3-fixed-encode: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav fate-ac3-fixed-encode: CMD = md5 -i $(SRC) -c ac3_fixed -b 128k -f ac3 fate-ac3-fixed-encode: CMP = oneline fate-ac3-fixed-encode: REF = a1d1fc116463b771abf5aef7ed37d7b1 -- cgit v1.2.3