[FFmpeg-cvslog] fate: Fix ffprobe tests with --target-path set.

Carl Eugen Hoyos git at videolan.org
Sun Aug 24 04:06:43 CEST 2014


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Sat Aug 16 12:19:05 2014 +0200| [7c0c97cc05afeaa52dfad902ae6639557fb71261] | committer: Carl Eugen Hoyos

fate: Fix ffprobe tests with --target-path set.

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

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

diff --git a/tests/Makefile b/tests/Makefile
index dd015ed..07557f9 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -36,10 +36,14 @@ tests/data/vsynth2.yuv: tests/rotozoom$(HOSTEXESUF) | tests/data
 tests/data/vsynth3.yuv: tests/videogen$(HOSTEXESUF) | tests/data
 	$(M)$< $@ $(FATEW) $(FATEH)
 
-tests/data/ffprobe-test.nut: ffmpeg$(EXESUF) | tests/data
+tests/test.ffmeta: TAG = COPY
+tests/test.ffmeta:
+	$(M)cp -f $(SRC_PATH)/tests/test.ffmeta $(TARGET_PATH)/tests/test.ffmeta
+
+tests/data/ffprobe-test.nut: ffmpeg$(EXESUF) | tests/data tests/test.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 $(SRC_PATH)/tests/test.ffmeta \
+        -f ffmetadata -i $(TARGET_PATH)/tests/test.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 \



More information about the ffmpeg-cvslog mailing list