diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | tests/regression-funcs.sh | 4 | ||||
| -rwxr-xr-x | tests/seek-regression.sh | 5 |
3 files changed, 8 insertions, 3 deletions
@@ -210,7 +210,7 @@ $(VCODEC_TESTS): $(VREF) $(LAVF_TESTS) $(LAVFI_TESTS): $(REFS) REFFILE = $(SRC_PATH)/tests/ref/$(1)/$(2:regtest-%=%) -RESFILE = tests/data/$(2:regtest-%=%).$(1).regression +RESFILE = tests/data/regression/$(1)/$(2:regtest-%=%) define VCODECTEST @echo "TEST VCODEC $(1:regtest-%=%)" diff --git a/tests/regression-funcs.sh b/tests/regression-funcs.sh index 8fd17abd06..678965045e 100755 --- a/tests/regression-funcs.sh +++ b/tests/regression-funcs.sh @@ -14,7 +14,8 @@ datadir="./tests/data" target_datadir="${target_path}/${datadir}" this="$test.$test_ref" -logfile="$datadir/$this.regression" +logdir="$datadir/regression/$test_ref" +logfile="$logdir/$test" outfile="$datadir/$test_ref/" errfile="$datadir/$this.err" @@ -35,6 +36,7 @@ target_crcfile="$target_datadir/$this.crc" mkdir -p "$datadir" mkdir -p "$outfile" +mkdir -p "$logdir" [ "${V-0}" -gt 0 ] && echov=echo || echov=: [ "${V-0}" -gt 1 ] || exec 2>$errfile diff --git a/tests/seek-regression.sh b/tests/seek-regression.sh index ae0ef6767e..cde4fd7566 100755 --- a/tests/seek-regression.sh +++ b/tests/seek-regression.sh @@ -12,6 +12,9 @@ target_path=$3 refdir="$src_path/tests/ref/seek" datadir="tests/data" +logdir="$datadir/regression/seek" + +mkdir -p "$logdir" list=$(ls -1 $datadir/vsynth2/* $datadir/acodec/* $datadir/lavf/*) imgs=$(for i in $datadir/images/*; do echo "$i/%02d.${i##*/}"; done) @@ -19,7 +22,7 @@ err=0 for i in $list $imgs; do base=$(basename $i) - logfile="$datadir/$base.seek.regression" + logfile="$logdir/$base" reffile="$refdir/$base.ref" echo "TEST SEEK $base" $echov $target_exec $target_path/tests/seek_test $target_path/$i |