Browse Source

tests/fate-run: New variable hostexecsuf for local fate tools.

Allows running fate in-tree on wsl with msvc.
tags/n4.2
Carl Eugen Hoyos 6 years ago
parent
commit
d0ca749adb
2 changed files with 5 additions and 4 deletions
  1. +1
    -0
      tests/Makefile
  2. +4
    -4
      tests/fate-run.sh

+ 1
- 0
tests/Makefile View File

@@ -232,6 +232,7 @@ FATE += $(FATE_HW-yes)

$(FATE) $(FATE_TESTS-no): export PROGSUF = $(PROGSSUF)
$(FATE) $(FATE_TESTS-no): export EXECSUF = $(EXESUF)
$(FATE) $(FATE_TESTS-no): export HOSTEXECSUF = $(HOSTEXESUF)
$(FATE) $(FATE_TESTS-no): $(FATE_UTILS:%=tests/%$(HOSTEXESUF)) | $(FATE_OUTDIRS)
@echo "TEST $(@:fate-%=%)"
$(Q)$(SRC_PATH)/tests/fate-run.sh $@ "$(TARGET_SAMPLES)" "$(TARGET_EXEC)" "$(TARGET_PATH)" '$(CMD)' '$(CMP)' '$(REF)' '$(FUZZ)' '$(THREADS)' '$(THREAD_TYPE)' '$(CPUFLAGS)' '$(CMP_SHIFT)' '$(CMP_TARGET)' '$(SIZE_TOLERANCE)' '$(CMP_UNIT)' '$(GEN)' '$(HWACCEL)' '$(REPORT)' '$(KEEP)'


+ 4
- 4
tests/fate-run.sh View File

@@ -5,7 +5,7 @@ export LC_ALL=C
base=$(dirname $0)
. "${base}/md5.sh"

base64=tests/base64
base64=tests/base64${HOSTEXECSUF}

test="${1#fate-}"
target_samples=$2
@@ -45,7 +45,7 @@ compare(){
}

do_tiny_psnr(){
psnr=$(tests/tiny_psnr "$1" "$2" $cmp_unit $cmp_shift 0) || return 1
psnr=$(tests/tiny_psnr${HOSTEXECSUF} "$1" "$2" $cmp_unit $cmp_shift 0) || return 1
val=$(expr "$psnr" : ".*$3: *\([0-9.]*\)")
size1=$(expr "$psnr" : '.*bytes: *\([0-9]*\)')
size2=$(expr "$psnr" : '.*bytes:[ 0-9]*/ *\([0-9]*\)')
@@ -206,7 +206,7 @@ enc_dec(){
ffmpeg $8 $DEC_OPTS -i $tencfile $ENC_OPTS $dec_opt $FLAGS \
-f $dec_fmt -y $tdecfile || return
do_md5sum $decfile
tests/tiny_psnr $srcfile $decfile $cmp_unit $cmp_shift
tests/tiny_psnr${HOSTEXECSUF} $srcfile $decfile $cmp_unit $cmp_shift
}

transcode(){
@@ -455,7 +455,7 @@ audio_match(){
cleanfiles="$cleanfiles $decfile"

ffmpeg -i "$sample" -bitexact $extra_args -y $decfile
tests/audiomatch $decfile $trefile
tests/audiomatch${HOSTEXECSUF} $decfile $trefile
}

concat(){


Loading…
Cancel
Save