[FFmpeg-cvslog] tests: Only run noproxy test if networking is enabled

[Diego Biurrun]

ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Tue Jul  2 17:16:18 2013 +0200| [6516632967da5e6bd7d6136e8678f826669ed26e] | committer: Diego Biurrun

tests: Only run noproxy test if networking is enabled

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

 libavformat/Makefile       |    5 +++--
 tests/fate/libavformat.mak |    8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/libavformat/Makefile b/libavformat/Makefile
index 24b303e..9d002a8 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 8332246..d532adc 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)