Commit f955d452 authored by Måns Rullgård's avatar Måns Rullgård

Change names of regtest output files to closer match the reference files

Originally committed as revision 24127 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent ee435580
...@@ -210,7 +210,7 @@ $(VCODEC_TESTS): $(VREF) ...@@ -210,7 +210,7 @@ $(VCODEC_TESTS): $(VREF)
$(LAVF_TESTS) $(LAVFI_TESTS): $(REFS) $(LAVF_TESTS) $(LAVFI_TESTS): $(REFS)
REFFILE = $(SRC_PATH)/tests/ref/$(1)/$(2:regtest-%=%) REFFILE = $(SRC_PATH)/tests/ref/$(1)/$(2:regtest-%=%)
RESFILE = tests/data/$(2:regtest-%=%).$(1).regression RESFILE = tests/data/regression/$(1)/$(2:regtest-%=%)
define VCODECTEST define VCODECTEST
@echo "TEST VCODEC $(1:regtest-%=%)" @echo "TEST VCODEC $(1:regtest-%=%)"
......
...@@ -14,7 +14,8 @@ datadir="./tests/data" ...@@ -14,7 +14,8 @@ datadir="./tests/data"
target_datadir="${target_path}/${datadir}" target_datadir="${target_path}/${datadir}"
this="$test.$test_ref" this="$test.$test_ref"
logfile="$datadir/$this.regression" logdir="$datadir/regression/$test_ref"
logfile="$logdir/$test"
outfile="$datadir/$test_ref/" outfile="$datadir/$test_ref/"
errfile="$datadir/$this.err" errfile="$datadir/$this.err"
...@@ -35,6 +36,7 @@ target_crcfile="$target_datadir/$this.crc" ...@@ -35,6 +36,7 @@ target_crcfile="$target_datadir/$this.crc"
mkdir -p "$datadir" mkdir -p "$datadir"
mkdir -p "$outfile" mkdir -p "$outfile"
mkdir -p "$logdir"
[ "${V-0}" -gt 0 ] && echov=echo || echov=: [ "${V-0}" -gt 0 ] && echov=echo || echov=:
[ "${V-0}" -gt 1 ] || exec 2>$errfile [ "${V-0}" -gt 1 ] || exec 2>$errfile
......
...@@ -12,6 +12,9 @@ target_path=$3 ...@@ -12,6 +12,9 @@ target_path=$3
refdir="$src_path/tests/ref/seek" refdir="$src_path/tests/ref/seek"
datadir="tests/data" datadir="tests/data"
logdir="$datadir/regression/seek"
mkdir -p "$logdir"
list=$(ls -1 $datadir/vsynth2/* $datadir/acodec/* $datadir/lavf/*) list=$(ls -1 $datadir/vsynth2/* $datadir/acodec/* $datadir/lavf/*)
imgs=$(for i in $datadir/images/*; do echo "$i/%02d.${i##*/}"; done) imgs=$(for i in $datadir/images/*; do echo "$i/%02d.${i##*/}"; done)
...@@ -19,7 +22,7 @@ err=0 ...@@ -19,7 +22,7 @@ err=0
for i in $list $imgs; do for i in $list $imgs; do
base=$(basename $i) base=$(basename $i)
logfile="$datadir/$base.seek.regression" logfile="$logdir/$base"
reffile="$refdir/$base.ref" reffile="$refdir/$base.ref"
echo "TEST SEEK $base" echo "TEST SEEK $base"
$echov $target_exec $target_path/tests/seek_test $target_path/$i $echov $target_exec $target_path/tests/seek_test $target_path/$i
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment