OSDN Git Service

tests/Makefile: Fix fate-ffprobe with --target-path
authorCarl Eugen Hoyos <cehoyos@ag.or.at>
Fri, 3 Oct 2014 10:59:14 +0000 (12:59 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 8 Oct 2014 14:26:20 +0000 (16:26 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tests/Makefile

index 184e220..386d883 100644 (file)
@@ -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)