[FFmpeg-cvslog] tests/Makefile: Fix fate-ffprobe with --target-path

Carl Eugen Hoyos git at videolan.org
Wed Oct 8 16:32:29 CEST 2014


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Fri Oct  3 12:59:14 2014 +0200| [1d4480d376b09e4a244d097205f737068721d274] | committer: Michael Niedermayer

tests/Makefile: Fix fate-ffprobe with --target-path

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1d4480d376b09e4a244d097205f737068721d274
---

 tests/Makefile |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/Makefile b/tests/Makefile
index 184e220..386d883 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -36,14 +36,14 @@ tests/data/vsynth2.yuv: tests/rotozoom$(HOSTEXESUF) | tests/data
 tests/data/vsynth3.yuv: tests/videogen$(HOSTEXESUF) | tests/data
 	$(M)$< $@ $(FATEW) $(FATEH)
 
-tests/test.ffmeta: TAG = COPY
-tests/test.ffmeta:
-	$(M)cp -f $(SRC_PATH)/tests/test.ffmeta $(TARGET_PATH)/tests/test.ffmeta
+tests/test_copy.ffmeta: TAG = COPY
+tests/test_copy.ffmeta: tests/data
+	$(M)cp -f $(SRC_PATH)/tests/test.ffmeta $(TARGET_PATH)/tests/test_copy.ffmeta
 
-tests/data/ffprobe-test.nut: ffmpeg$(EXESUF) | tests/data tests/test.ffmeta
+tests/data/ffprobe-test.nut: ffmpeg$(EXESUF) tests/test_copy.ffmeta
 	$(M)$(TARGET_EXEC) ./$< \
         -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.ffmeta \
+        -f ffmetadata -i $(TARGET_PATH)/tests/test_copy.ffmeta \
         -flags +bitexact -map 0:0 -map 0:1 -map 0:2 -map_metadata 1 \
         -map_metadata:s:0 1:s:0 -map_metadata:s:1 1:s:1 \
         -vcodec rawvideo -acodec pcm_s16le \
@@ -216,7 +216,7 @@ testclean:
 	$(RM) -r tests/vsynth1 tests/data tools/lavfi-showfiltfmts$(EXESUF)
 	$(RM) $(CLEANSUFFIXES:%=tests/%)
 	$(RM) $(TESTTOOLS:%=tests/%$(HOSTEXESUF))
-	$(RM) tests/pixfmts.mak
+	$(RM) tests/pixfmts.mak tests/test_copy.ffmeta
 
 -include $(wildcard tests/*.d)
 



More information about the ffmpeg-cvslog mailing list