diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile | 2 | ||||
| -rwxr-xr-x | tests/fate-run.sh | 6 | ||||
| -rwxr-xr-x | tests/regression-funcs.sh | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/tests/Makefile b/tests/Makefile index 45ce130..d9856dc 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -142,7 +142,7 @@ fate:: $(FATE) $(FATE): $(TOOL)$(EXESUF) $(FATE_UTILS:%=tests/%$(HOSTEXESUF)) @echo "TEST $(@:fate-%=%)" - $(Q)$(SRC_PATH)/tests/fate-run.sh $@ "$(SAMPLES)" "$(TARGET_EXEC)" "$(TARGET_PATH)" '$(CMD)' '$(CMP)' '$(REF)' '$(FUZZ)' '$(THREADS)' '$(THREAD_TYPE)' '$(TOOL)' + $(Q)$(SRC_PATH)/tests/fate-run.sh $@ "$(SAMPLES)" "$(TARGET_EXEC)" "$(TARGET_PATH)" '$(CMD)' '$(CMP)' '$(REF)' '$(FUZZ)' '$(THREADS)' '$(THREAD_TYPE)' '$(CPUFLAGS)' fate-list: @printf '%s\n' $(sort $(FATE)) diff --git a/tests/fate-run.sh b/tests/fate-run.sh index d7b5e7e..f7a51ad 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -17,7 +17,7 @@ ref=${7:-"${base}/ref/fate/${test}"} fuzz=$8 threads=${9:-1} thread_type=${10:-frame+slice} -tool=${11} +cpuflags=${11:-all} outdir="tests/data/fate" outfile="${outdir}/${test}" @@ -51,7 +51,7 @@ run(){ } avconv(){ - run $tool -nostats -threads $threads -thread_type $thread_type "$@" + run ffmpeg -nostats -threads $threads -thread_type $thread_type -cpuflags $cpuflags "$@" } framecrc(){ @@ -77,7 +77,7 @@ pcm(){ regtest(){ t="${test#$2-}" ref=${base}/ref/$2/$t - ${base}/${1}-regression.sh $t $2 $3 "$target_exec" "$target_path" "$threads" "$thread_type" "$tool" "$samples" + ${base}/${1}-regression.sh $t $2 $3 "$target_exec" "$target_path" "$threads" "$thread_type" "$cpuflags" "$samples" } codectest(){ diff --git a/tests/regression-funcs.sh b/tests/regression-funcs.sh index 1cafb3f..7244b66 100755 --- a/tests/regression-funcs.sh +++ b/tests/regression-funcs.sh @@ -10,7 +10,7 @@ raw_src_dir=$3 target_exec=$4 target_path=$5 threads=${6:-1} -tool=$8 +cpuflags=${8:-all} samples=$9 datadir="./tests/data" @@ -20,7 +20,7 @@ this="$test.$test_ref" outfile="$datadir/$test_ref/" # various files -avconv="$target_exec ${target_path}/${tool}" +avconv="$target_exec ${target_path}/ffmpeg" tiny_psnr="tests/tiny_psnr" raw_src="${target_path}/$raw_src_dir/%02d.pgm" raw_dst="$datadir/$this.out.yuv" @@ -45,7 +45,7 @@ echov(){ . $(dirname $0)/md5.sh -AVCONV_OPTS="-nostats -y" +AVCONV_OPTS="-nostats -y -cpuflags $cpuflags" COMMON_OPTS="-flags +bitexact -idct simple -sws_flags +accurate_rnd+bitexact" DEC_OPTS="$COMMON_OPTS -threads $threads" ENC_OPTS="$COMMON_OPTS -threads 1 -dct fastint" |
