summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGyan Doshi <ffmpeg@gyani.pro>2019-04-02 16:43:06 +0530
committerGyan Doshi <ffmpeg@gyani.pro>2019-04-03 10:05:50 +0530
commitb131a07e4bf9ef3370b2fa546973301495154bd1 (patch)
treed76e6103fa14b895be09a24f4e6eb09cf07cccd5
parentecb4398d71c9882c8db67761b3227f27eddb449b (diff)
downloadffmpeg-streaming-b131a07e4bf9ef3370b2fa546973301495154bd1.zip
ffmpeg-streaming-b131a07e4bf9ef3370b2fa546973301495154bd1.tar.gz
fate: unbreak fate with custom binary names
-rw-r--r--tests/Makefile1
-rwxr-xr-xtests/fate-run.sh4
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/Makefile b/tests/Makefile
index ae48db8..50408c2 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 66cd791..696fc24 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"
OpenPOWER on IntegriCloud