[11/20] tests: Refactor some variable settings

Message ID 20180920084729.4523-12-diego@biurrun.de
State New
Headers show
Series
  • [01/20] tests: Use more consistent names for tests
Related show

Commit Message

Diego Biurrun Sept. 20, 2018, 8:47 a.m.
---
 tests/fate-run.sh | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

Patch

diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index 74efa66057..603860b81d 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -152,27 +152,19 @@  enc_dec(){
     tests/tiny_psnr $srcfile $decfile $cmp_unit $cmp_shift
 }
 
-datadir="tests/data"
-target_datadir="${target_path}/${datadir}"
-
-this="$test.lavf"
-
 # various files
 avconv2="$target_exec ${target_path}/avconv"
 raw_src="${target_path}/tests/vsynth1/%02d.pgm"
-raw_dst="$datadir/$this.out.yuv"
-pcm_src="$target_datadir/asynth1.sw"
-crcfile="$datadir/$this.crc"
-target_crcfile="$target_datadir/$this.crc"
+crcfile="tests/data/$test.lavf.crc"
+target_crcfile="${target_path}/$crcfile"
 
 echov(){
     echo "$@" >&3
 }
 
-AVCONV_OPTS="-nostats -y -cpuflags $cpuflags"
-COMMON_OPTS="-flags +bitexact -idct simple -sws_flags +accurate_rnd+bitexact -fflags +bitexact"
-DEC_OPTS="$COMMON_OPTS -threads $threads"
-ENC_OPTS="$COMMON_OPTS -threads 1 -dct fastint"
+AVCONV_OPTS="-nostats -y -cpuflags $cpuflags -threads $threads"
+DEC_OPTS="-flags +bitexact -idct simple -sws_flags +accurate_rnd+bitexact -fflags +bitexact"
+ENC_OPTS="$DEC_OPTS -threads 1 -dct fastint"
 
 run_avconv(){
     $echov $avconv2 $AVCONV_OPTS $*