From 1b260757b8b4057691c377bc0ae802b896b5338a Mon Sep 17 00:00:00 2001 From: Maksim Stsepanenka Date: Mon, 27 May 2019 01:24:52 +0300 Subject: [PATCH] tests: make test 1420 and 1406 work with rtsp-disabled libcurl Closes #3948 --- tests/data/test1406 | 3 ++- tests/data/test1420 | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/data/test1406 b/tests/data/test1406 index 7d973e7ef..ab835d3cb 100644 --- a/tests/data/test1406 +++ b/tests/data/test1406 @@ -89,7 +89,6 @@ int main(int argc, char *argv[]) them yourself. CURLOPT_WRITEDATA set to a objectpointer - CURLOPT_INTERLEAVEDATA set to a objectpointer CURLOPT_WRITEFUNCTION set to a functionpointer CURLOPT_READDATA set to a objectpointer CURLOPT_READFUNCTION set to a functionpointer @@ -117,12 +116,14 @@ int main(int argc, char *argv[]) # These options vary with configurations - just ignore them +# CURLOPT_INTERLEAVEDATA requires RTSP (HTTP) protocol $_ = '' if /CURLOPT_USERAGENT/ $_ = '' if /CURLOPT_MAXREDIRS/ $_ = '' if /CURLOPT_SSL_VERIFYPEER/ $_ = '' if /CURLOPT_SSH_KNOWNHOSTS/ $_ = '' if /CURLOPT_HTTP_VERSION/ $_ = '' if /CURLOPT_HTTP09_ALLOWED/ +$_ = '' if /CURLOPT_INTERLEAVEDATA/ diff --git a/tests/data/test1420 b/tests/data/test1420 index c3d31f349..ebd45ff84 100644 --- a/tests/data/test1420 +++ b/tests/data/test1420 @@ -75,7 +75,6 @@ int main(int argc, char *argv[]) them yourself. CURLOPT_WRITEDATA set to a objectpointer - CURLOPT_INTERLEAVEDATA set to a objectpointer CURLOPT_WRITEFUNCTION set to a functionpointer CURLOPT_READDATA set to a objectpointer CURLOPT_READFUNCTION set to a functionpointer @@ -101,11 +100,13 @@ int main(int argc, char *argv[]) # These options vary with configurations - just ignore them +# CURLOPT_INTERLEAVEDATA requires RTSP (HTTP) protocol $_ = '' if /CURLOPT_USERAGENT/ $_ = '' if /CURLOPT_MAXREDIRS/ $_ = '' if /CURLOPT_SSL_VERIFYPEER/ $_ = '' if /CURLOPT_SSH_KNOWNHOSTS/ $_ = '' if /CURLOPT_HTTP_VERSION/ +$_ = '' if /CURLOPT_INTERLEAVEDATA/