From 3ade7d32c1f17f2f833ff17c2cbd46d6de66104c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= Date: Fri, 9 Jul 2010 00:40:45 +0000 Subject: [PATCH] fate: pass additional variables to test script This passes the following additional variables to the test script: - CMP method to use comparing output with reference, default 'diff' - REF reference file, default 'tests/ref/fate/${test}' - FUZZ maximum fuzz factor in comparison, meaning depends on CMP Originally committed as revision 24133 to svn://svn.ffmpeg.org/ffmpeg/trunk --- Makefile | 2 +- tests/fate-run.sh | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index fe39154829..efb714f6c0 100644 --- a/Makefile +++ b/Makefile @@ -281,7 +281,7 @@ ifdef SAMPLES fate: $(FATE_TESTS) $(FATE_TESTS): ffmpeg$(EXESUF) @echo "TEST FATE $(@:fate-%=%)" - @$(SRC_PATH)/tests/fate-run.sh $@ "$(SAMPLES)" "$(TARGET_EXEC)" "$(TARGET_PATH)" '$(CMD)' + @$(SRC_PATH)/tests/fate-run.sh $@ "$(SAMPLES)" "$(TARGET_EXEC)" "$(TARGET_PATH)" '$(CMD)' '$(CMP)' '$(REF)' '$(FUZZ)' else fate $(FATE_TESTS): @echo "SAMPLES not specified, cannot run FATE" diff --git a/tests/fate-run.sh b/tests/fate-run.sh index 899580fa71..39f42ffcc3 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -8,12 +8,17 @@ SAMPLES_PATH=$2 target_exec=$3 BUILD_PATH=$4 command=$5 +cmp=${6:-diff} -ref="${base}/ref/fate/${test}" +ref=${7:-"${base}/ref/fate/${test}"} +fuzz=$8 outdir="tests/data/fate" outfile="${outdir}/${test}" mkdir -p "$outdir" eval $target_exec $command > "$outfile" 2>/dev/null -diff -u -w "$ref" "$outfile" + +case $cmp in + diff) diff -u -w "$ref" "$outfile" ;; +esac