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

Originally committed as revision 24127 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/Makefile b/Makefile
index 0040bd18b8c0d9aa73f5fcacb32c01332457f05d..fe39154829e8a87e428d7c8093818d101a4ffdd6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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 8fd17abd064d01825bfb5b0a12ef19ba7b28e103..678965045eb8cc964f3306fa5ed0194f7c47afcb 100755 (executable)
--- 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 ae0ef6767e5fc5732f0097eb554adf93995cafa2..cde4fd7566cf44687712d56fa9eb6fb475dc4d33 100755 (executable)
--- 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