summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2013-07-02 17:16:18 +0200
committerDiego Biurrun <diego@biurrun.de>2013-07-06 15:36:57 +0200
commit6516632967da5e6bd7d6136e8678f826669ed26e (patch)
tree3d98258702e0133a76d66aa6e565f7e4855fed78
parent73142e753381519de645a56e7d6994c77a3fd27f (diff)
tests: Only run noproxy test if networking is enabled
-rw-r--r--libavformat/Makefile5
-rw-r--r--tests/fate/libavformat.mak8
2 files changed, 7 insertions, 6 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 24b303e345..9d002a8e7f 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -383,11 +383,12 @@ SKIPHEADERS-$(CONFIG_NETWORK) += network.h rtsp.h
EXAMPLES = metadata \
output \
-TESTPROGS = noproxy \
- seek \
+TESTPROGS = seek \
srtp \
url \
+TESTPROGS-$(CONFIG_NETWORK) += noproxy
+
TOOLS = aviocat \
ismindex \
pktdumper \
diff --git a/tests/fate/libavformat.mak b/tests/fate/libavformat.mak
index 8332246949..d532adcb15 100644
--- a/tests/fate/libavformat.mak
+++ b/tests/fate/libavformat.mak
@@ -1,14 +1,14 @@
-FATE_LIBAVFORMAT += fate-noproxy
+FATE_LIBAVFORMAT-$(CONFIG_NETWORK) += fate-noproxy
fate-noproxy: libavformat/noproxy-test$(EXESUF)
fate-noproxy: CMD = run libavformat/noproxy-test
-FATE_LIBAVFORMAT += fate-srtp
+FATE_LIBAVFORMAT-yes += fate-srtp
fate-srtp: libavformat/srtp-test$(EXESUF)
fate-srtp: CMD = run libavformat/srtp-test
-FATE_LIBAVFORMAT += fate-url
+FATE_LIBAVFORMAT-yes += fate-url
fate-url: libavformat/url-test$(EXESUF)
fate-url: CMD = run libavformat/url-test
-FATE-$(CONFIG_AVFORMAT) += $(FATE_LIBAVFORMAT)
+FATE-$(CONFIG_AVFORMAT) += $(FATE_LIBAVFORMAT-yes)
fate-libavformat: $(FATE_LIBAVFORMAT)