Browse Source

fate: add support for multithread testing

Add a THREADS variable to fate calls.
tags/n0.8
Luca Barbato 14 years ago
parent
commit
7851eb68c6
3 changed files with 6 additions and 4 deletions
  1. +1
    -1
      Makefile
  2. +3
    -2
      tests/fate-run.sh
  3. +2
    -1
      tests/regression-funcs.sh

+ 1
- 1
Makefile View File

@@ -290,7 +290,7 @@ fate: $(FATE)


$(FATE): ffmpeg$(EXESUF) $(FATE_UTILS:%=tests/%$(HOSTEXESUF)) $(FATE): ffmpeg$(EXESUF) $(FATE_UTILS:%=tests/%$(HOSTEXESUF))
@echo "TEST $(@:fate-%=%)" @echo "TEST $(@:fate-%=%)"
$(Q)$(SRC_PATH)/tests/fate-run.sh $@ "$(SAMPLES)" "$(TARGET_EXEC)" "$(TARGET_PATH)" '$(CMD)' '$(CMP)' '$(REF)' '$(FUZZ)'
$(Q)$(SRC_PATH)/tests/fate-run.sh $@ "$(SAMPLES)" "$(TARGET_EXEC)" "$(TARGET_PATH)" '$(CMD)' '$(CMP)' '$(REF)' '$(FUZZ)' '$(THREADS)'


fate-list: fate-list:
@printf '%s\n' $(sort $(FATE)) @printf '%s\n' $(sort $(FATE))


+ 3
- 2
tests/fate-run.sh View File

@@ -15,6 +15,7 @@ command=$5
cmp=${6:-diff} cmp=${6:-diff}
ref=${7:-"${base}/ref/fate/${test}"} ref=${7:-"${base}/ref/fate/${test}"}
fuzz=$8 fuzz=$8
threads=${9:-1}


outdir="tests/data/fate" outdir="tests/data/fate"
outfile="${outdir}/${test}" outfile="${outdir}/${test}"
@@ -48,7 +49,7 @@ run(){
} }


ffmpeg(){ ffmpeg(){
run ffmpeg -v 0 "$@"
run ffmpeg -v 0 -threads $threads "$@"
} }


framecrc(){ framecrc(){
@@ -77,7 +78,7 @@ regtest(){
cleanfiles="$cleanfiles $outfile $errfile" cleanfiles="$cleanfiles $outfile $errfile"
outfile=tests/data/regression/$2/$t outfile=tests/data/regression/$2/$t
errfile=tests/data/$t.$2.err errfile=tests/data/$t.$2.err
${base}/${1}-regression.sh $t $2 $3 "$target_exec" "$target_path"
${base}/${1}-regression.sh $t $2 $3 "$target_exec" "$target_path" "$threads"
} }


codectest(){ codectest(){


+ 2
- 1
tests/regression-funcs.sh View File

@@ -9,6 +9,7 @@ test_ref=$2
raw_src_dir=$3 raw_src_dir=$3
target_exec=$4 target_exec=$4
target_path=$5 target_path=$5
threads=${6:-1}


datadir="./tests/data" datadir="./tests/data"
target_datadir="${target_path}/${datadir}" target_datadir="${target_path}/${datadir}"
@@ -52,7 +53,7 @@ echov(){


. $(dirname $0)/md5.sh . $(dirname $0)/md5.sh


FFMPEG_OPTS="-v 0 -y -flags +bitexact -dct fastint -idct simple -sws_flags +accurate_rnd+bitexact"
FFMPEG_OPTS="-v 0 -threads $threads -y -flags +bitexact -dct fastint -idct simple -sws_flags +accurate_rnd+bitexact"


run_ffmpeg() run_ffmpeg()
{ {


Loading…
Cancel
Save