diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-07 11:26:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-07 11:26:28 +0200 |
| commit | 7bd417c22a90a712df57cacfa5b09c1fb4f6183a (patch) | |
| tree | 791ce856605d50cc601bb892ec9ff0b073a73353 /tests | |
| parent | 2adf8a9c09c9d00c4b34c062206cefad489f9ba9 (diff) | |
| parent | 6516632967da5e6bd7d6136e8678f826669ed26e (diff) | |
Merge commit '6516632967da5e6bd7d6136e8678f826669ed26e'
* commit '6516632967da5e6bd7d6136e8678f826669ed26e':
tests: Only run noproxy test if networking is enabled
fifo: K&R formatting cosmetics
Conflicts:
libavformat/Makefile
libavutil/fifo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fate/libavformat.mak | 8 |
1 files changed, 4 insertions, 4 deletions
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) |