RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

tests: Only run noproxy test if networking is enabled

This commit is contained in:
Diego Biurrun 2013-07-02 17:16:18 +02:00
parent 73142e7533
commit 6516632967
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/Makefile
View File

@ -383,11 +383,12 @@ SKIPHEADERS-$(CONFIG_NETWORK) += network.h rtsp.h
EXAMPLES = metadata \ EXAMPLES = metadata \
output \ output \
TESTPROGS = noproxy \ TESTPROGS = seek \
seek \
srtp \ srtp \
url \ url \
TESTPROGS-$(CONFIG_NETWORK) += noproxy
TOOLS = aviocat \ TOOLS = aviocat \
ismindex \ ismindex \
pktdumper \ pktdumper \

8
tests/fate/libavformat.mak
View File

@ -1,14 +1,14 @@
FATE_LIBAVFORMAT += fate-noproxy FATE_LIBAVFORMAT-$(CONFIG_NETWORK) += fate-noproxy
fate-noproxy: libavformat/noproxy-test$(EXESUF) fate-noproxy: libavformat/noproxy-test$(EXESUF)
fate-noproxy: CMD = run libavformat/noproxy-test fate-noproxy: CMD = run libavformat/noproxy-test
FATE_LIBAVFORMAT += fate-srtp FATE_LIBAVFORMAT-yes += fate-srtp
fate-srtp: libavformat/srtp-test$(EXESUF) fate-srtp: libavformat/srtp-test$(EXESUF)
fate-srtp: CMD = run libavformat/srtp-test fate-srtp: CMD = run libavformat/srtp-test
FATE_LIBAVFORMAT += fate-url FATE_LIBAVFORMAT-yes += fate-url
fate-url: libavformat/url-test$(EXESUF) fate-url: libavformat/url-test$(EXESUF)
fate-url: CMD = run libavformat/url-test fate-url: CMD = run libavformat/url-test
FATE-$(CONFIG_AVFORMAT) += $(FATE_LIBAVFORMAT) FATE-$(CONFIG_AVFORMAT) += $(FATE_LIBAVFORMAT-yes)
fate-libavformat: $(FATE_LIBAVFORMAT) fate-libavformat: $(FATE_LIBAVFORMAT)