diff options
author | Christophe Gisquet <christophe.gisquet@gmail.com> | 2015-10-14 19:18:27 +0200 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-10-16 14:02:12 +0200 |
commit | 42c1dcde683f949822335d5d909a2364acbd1fcd (patch) | |
tree | 551a2af7382e0790c4dc5cc5397446fa2f9eb47a /tests/Makefile | |
parent | 5e80a6cd315debe462feaf30b635c07cb0f44abb (diff) | |
download | ffmpeg-streaming-42c1dcde683f949822335d5d909a2364acbd1fcd.zip ffmpeg-streaming-42c1dcde683f949822335d5d909a2364acbd1fcd.tar.gz |
fate: use PROGSSUF
May require exporting in the shell var PROGSUF when invoking a
shell script.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'tests/Makefile')
-rw-r--r-- | tests/Makefile | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/tests/Makefile b/tests/Makefile index c0c1958..7ee4a46 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -7,9 +7,12 @@ AREF = tests/data/asynth1.sw FATEW = 34 FATEH = 34 +FFMPEG=ffmpeg$(PROGSSUF)$(EXESUF) + $(AREF): CMP= -ffservertest: ffserver$(EXESUF) tests/vsynth1/00.pgm tests/data/asynth1.sw +ffservertest: export PROGSUF = $(PROGSSUF) +ffservertest: ffserver$(PROGSSUF)$(EXESUF) tests/vsynth1/00.pgm tests/data/asynth1.sw @echo @echo "Unfortunately ffserver is broken and therefore its regression" @echo "test fails randomly. Treat the results accordingly." @@ -44,7 +47,7 @@ tests/test_copy.ffmeta: TAG = COPY tests/test_copy.ffmeta: tests/data $(M)cp -f $(SRC_PATH)/tests/test.ffmeta tests/test_copy.ffmeta -tests/data/ffprobe-test.nut: ffmpeg$(EXESUF) tests/test_copy.ffmeta +tests/data/ffprobe-test.nut: ffmpeg$(PROGSSUF)$(EXESUF) tests/test_copy.ffmeta $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< \ -f lavfi -i "aevalsrc=sin(400*PI*2*t):d=0.125[out0]; testsrc=d=0.125[out1]; testsrc=s=100x100:d=0.125[out2]" \ -f ffmetadata -i $(TARGET_PATH)/tests/test_copy.ffmeta \ @@ -177,9 +180,9 @@ FATE += $(FATE-yes) RSYNC_OPTIONS-$(HAVE_RSYNC_CONTIMEOUT) += --contimeout=60 RSYNC_OPTIONS = -vrltLW --timeout=60 $(RSYNC_OPTIONS-yes) -$(FATE_FFMPEG) $(FATE_SAMPLES_AVCONV) $(FATE_SAMPLES_FFMPEG): ffmpeg$(EXESUF) +$(FATE_FFMPEG) $(FATE_SAMPLES_AVCONV) $(FATE_SAMPLES_FFMPEG): ffmpeg$(PROGSSUF)$(EXESUF) -$(FATE_FFPROBE) $(FATE_SAMPLES_FFPROBE): ffprobe$(EXESUF) +$(FATE_FFPROBE) $(FATE_SAMPLES_FFPROBE): ffprobe$(PROGSSUF)$(EXESUF) ifdef SAMPLES FATE += $(FATE_FULL) $(FATE_FULL-yes) @@ -201,6 +204,7 @@ TOOL = ffmpeg fate:: $(FATE) +$(FATE) $(FATE_TESTS-no): export PROGSUF = $(PROGSSUF) $(FATE) $(FATE_TESTS-no): $(FATE_UTILS:%=tests/%$(HOSTEXESUF)) @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)' @@ -226,7 +230,7 @@ lcov-reset: clean:: testclean testclean:: - $(RM) -r tests/vsynth1 tests/data tools/lavfi-showfiltfmts$(EXESUF) + $(RM) -r tests/vsynth1 tests/data tools/lavfi-showfiltfmts$(PROGSSUF)$(EXESUF) $(RM) $(CLEANSUFFIXES:%=tests/%) $(RM) $(TESTTOOLS:%=tests/%$(HOSTEXESUF)) $(RM) tests/pixfmts.mak tests/test_copy.ffmeta |