tests: Only run noproxy test if networking is enabled

12 years ago · 6516632967
parent 73142e7533
commit 6516632967
2 changed files with 7 additions and 6 deletions
--- 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                                                   \
--- 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)