frsh: Export information about the last RTP contract and VRES

[frescor/ffmpeg.git] / Makefile

diff --git a/Makefile b/Makefile
index 50fca51e4c8ca6a1dbf8d61043edfb7fe3087516..6b20ac16637b4e0bcfd6942a29be3023ead4e806 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -115,7 +115,7 @@ uninstall-man:
        rm -f $(addprefix "$(MANDIR)/man1/",$(ALLMANPAGES))
 
 testclean:
-       rm -rf tests/vsynth1 tests/vsynth2 tests/data tests/asynth1.sw tests/*~
+       rm -rf tests/vsynth1 tests/vsynth2 tests/data tests/*~
 
 clean:: testclean
        rm -f $(ALLPROGS) $(ALLPROGS_G)
@@ -265,24 +265,24 @@ $(LAVF_REGFILES): $(LAVF_TESTS)
 
 $(CODEC_TESTS) $(LAVF_TESTS): regtest-ref
 
-regtest-ref: ffmpeg$(EXESUF) tests/vsynth1/00.pgm tests/vsynth2/00.pgm tests/asynth1.sw
+regtest-ref: ffmpeg$(EXESUF) tests/vsynth1/00.pgm tests/vsynth2/00.pgm tests/data/asynth1.sw
 
 $(CODEC_TESTS) regtest-ref: tests/tiny_psnr$(HOSTEXESUF)
-       $(SRC_PATH)/tests/regression.sh $@ vsynth   tests/vsynth1 a "$(TARGET_EXEC)" "$(TARGET_PATH)"
-       $(SRC_PATH)/tests/regression.sh $@ rotozoom tests/vsynth2 a "$(TARGET_EXEC)" "$(TARGET_PATH)"
+       $(SRC_PATH)/tests/codec-regression.sh $@ vsynth   tests/vsynth1 a "$(TARGET_EXEC)" "$(TARGET_PATH)"
+       $(SRC_PATH)/tests/codec-regression.sh $@ rotozoom tests/vsynth2 a "$(TARGET_EXEC)" "$(TARGET_PATH)"
 
 $(LAVF_TESTS):
-       $(SRC_PATH)/tests/regression.sh $@ lavf tests/vsynth1 b "$(TARGET_EXEC)" "$(TARGET_PATH)"
+       $(SRC_PATH)/tests/codec-regression.sh $@ lavf tests/vsynth1 b "$(TARGET_EXEC)" "$(TARGET_PATH)"
 
 seektest: codectest lavftest tests/seek_test$(EXESUF)
        $(SRC_PATH)/tests/seek-regression.sh $(SEEK_REFFILE) "$(TARGET_EXEC)" "$(TARGET_PATH)"
 
-ffservertest: ffserver$(EXESUF) tests/vsynth1/00.pgm tests/asynth1.sw
+ffservertest: ffserver$(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."
        @echo
-       $(SRC_PATH)/tests/server-regression.sh $(FFSERVER_REFFILE) $(SRC_PATH)/tests/ffserver.conf
+       $(SRC_PATH)/tests/ffserver-regression.sh $(FFSERVER_REFFILE) $(SRC_PATH)/tests/ffserver.conf
 
 tests/vsynth1/00.pgm: tests/videogen$(HOSTEXESUF)
        mkdir -p tests/vsynth1
@@ -292,7 +292,8 @@ tests/vsynth2/00.pgm: tests/rotozoom$(HOSTEXESUF)
        mkdir -p tests/vsynth2
        $(BUILD_ROOT)/$< 'tests/vsynth2/' $(SRC_PATH)/tests/lena.pnm
 
-tests/asynth1.sw: tests/audiogen$(HOSTEXESUF)
+tests/data/asynth1.sw: tests/audiogen$(HOSTEXESUF)
+       mkdir -p tests/data
        $(BUILD_ROOT)/$< $@
 
 tests/%$(HOSTEXESUF): tests/%.c