From b131a07e4bf9ef3370b2fa546973301495154bd1 Mon Sep 17 00:00:00 2001
From: Gyan Doshi <ffmpeg@gyani.pro>
Date: Tue, 2 Apr 2019 16:43:06 +0530
Subject: fate: unbreak fate with custom binary names

---
 tests/Makefile    | 1 +
 tests/fate-run.sh | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'tests')

diff --git a/tests/Makefile b/tests/Makefile
index ae48db8586..50408c2d3e 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -231,6 +231,7 @@ fate-hw: $(FATE_HW-yes)
 FATE += $(FATE_HW-yes)
 
 $(FATE) $(FATE_TESTS-no): export PROGSUF = $(PROGSSUF)
+$(FATE) $(FATE_TESTS-no): export EXECSUF = $(EXESUF)
 $(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)'
diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index 66cd7914ba..696fc2415c 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -128,7 +128,7 @@ ffmpeg(){
         [ x${arg} = x-i ] && ffmpeg_args="${ffmpeg_args} ${dec_opts}"
         ffmpeg_args="${ffmpeg_args} ${arg}"
     done
-    run ffmpeg${PROGSUF} ${ffmpeg_args}
+    run ffmpeg${PROGSUF}${EXECSUF} ${ffmpeg_args}
 }
 
 framecrc(){
@@ -245,7 +245,7 @@ stream_remux(){
 
 # FIXME: There is a certain duplication between the avconv-related helper
 # functions above and below that should be refactored.
-ffmpeg2="$target_exec ${target_path}/ffmpeg"
+ffmpeg2="$target_exec ${target_path}/ffmpeg${PROGSUF}${EXECSUF}"
 raw_src="${target_path}/tests/vsynth1/%02d.pgm"
 pcm_src="${target_path}/tests/data/asynth1.sw"
 crcfile="tests/data/$test.lavf.crc"
-- 
cgit v1.2.3