diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-28 13:12:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-28 13:13:04 +0100 |
| commit | 03678a32bcb8e1ae5c213e02faf62df166cca05d (patch) | |
| tree | 035a1b8ab38470337cf066aae3ab1cc60a03c48b /tests | |
| parent | 085bd039bb095cdf35ef41932eebbc428c5caa76 (diff) | |
| parent | 5c8696555abd30a200d0d882e2913f66619fba68 (diff) | |
| download | ffmpeg-03678a32bcb8e1ae5c213e02faf62df166cca05d.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavf: Add a fate test for the noproxy pattern matching
lavf: Handle the environment variable no_proxy more properly
Conflicts:
libavformat/Makefile
libavformat/internal.h
libavformat/tls.c
libavformat/utils.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fate/libavformat.mak | 4 | ||||
| -rw-r--r-- | tests/ref/fate/noproxy | 9 |
2 files changed, 13 insertions, 0 deletions
diff --git a/tests/fate/libavformat.mak b/tests/fate/libavformat.mak index 20bc31999f..8332246949 100644 --- a/tests/fate/libavformat.mak +++ b/tests/fate/libavformat.mak @@ -1,3 +1,7 @@ +FATE_LIBAVFORMAT += fate-noproxy +fate-noproxy: libavformat/noproxy-test$(EXESUF) +fate-noproxy: CMD = run libavformat/noproxy-test + FATE_LIBAVFORMAT += fate-srtp fate-srtp: libavformat/srtp-test$(EXESUF) fate-srtp: CMD = run libavformat/srtp-test diff --git a/tests/ref/fate/noproxy b/tests/ref/fate/noproxy new file mode 100644 index 0000000000..7707609d0f --- /dev/null +++ b/tests/ref/fate/noproxy @@ -0,0 +1,9 @@ +The pattern "(null)" does not match the hostname domain.com +The pattern "example.com domain.com" matches the hostname domain.com +The pattern "example.com other.com" does not match the hostname domain.com +The pattern "example.com,domain.com" matches the hostname domain.com +The pattern "example.com,domain.com" does not match the hostname otherdomain.com +The pattern "example.com, *.domain.com" matches the hostname sub.domain.com +The pattern "example.com, *.domain.com" matches the hostname domain.com +The pattern "example.com, .domain.com" matches the hostname domain.com +The pattern "*" matches the hostname domain.com |