diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/cmake/CMakeLists.txt | 63 | ||||
| -rwxr-xr-x | tests/cmake/test.sh | 6 | ||||
| -rw-r--r-- | tests/data/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/data/test3034 | 40 | ||||
| -rw-r--r-- | tests/data/test96 | 1 | ||||
| -rw-r--r-- | tests/libtest/Makefile.inc | 2 | ||||
| -rw-r--r-- | tests/libtest/lib3034.c | 77 |
7 files changed, 165 insertions, 26 deletions
diff --git a/tests/cmake/CMakeLists.txt b/tests/cmake/CMakeLists.txt index d40a6b25d..2c3d0daeb 100644 --- a/tests/cmake/CMakeLists.txt +++ b/tests/cmake/CMakeLists.txt @@ -31,20 +31,7 @@ option(TEST_INTEGRATION_MODE "Integration mode" "find_package") message(STATUS "TEST_INTEGRATION_MODE: ${TEST_INTEGRATION_MODE}") -if(TEST_INTEGRATION_MODE STREQUAL "FetchContent" AND CMAKE_VERSION VERSION_LESS 3.14) - message(FATAL_ERROR "This test requires CMake 3.14 or upper") -endif() - -if(TEST_INTEGRATION_MODE STREQUAL "ExternalProject") # Broken - include(ExternalProject) - ExternalProject_Add(libssh2 - URL "${FROM_ARCHIVE}" URL_HASH "SHA256=${FROM_HASH}" - INSTALL_COMMAND "" - DOWNLOAD_EXTRACT_TIMESTAMP ON) -endif() - -if(TEST_INTEGRATION_MODE STREQUAL "find_package" OR - TEST_INTEGRATION_MODE STREQUAL "ExternalProject") +if(TEST_INTEGRATION_MODE STREQUAL "find_package") find_package(CURL REQUIRED CONFIG) find_package(CURL REQUIRED CONFIG) # Double-inclusion test foreach(_result_var IN ITEMS @@ -75,6 +62,9 @@ elseif(TEST_INTEGRATION_MODE STREQUAL "add_subdirectory") set(BUILD_STATIC_LIBS ON CACHE BOOL "") add_subdirectory(curl) elseif(TEST_INTEGRATION_MODE STREQUAL "FetchContent") + if(CMAKE_VERSION VERSION_LESS 3.14) + message(FATAL_ERROR "This test requires CMake 3.14 or upper") + endif() include(FetchContent) option(FROM_GIT_REPO "Git URL" "https://github.com/curl/curl.git") option(FROM_GIT_TAG "Git tag" "master") @@ -85,17 +75,48 @@ elseif(TEST_INTEGRATION_MODE STREQUAL "FetchContent") set(BUILD_SHARED_LIBS ON CACHE BOOL "") set(BUILD_STATIC_LIBS ON CACHE BOOL "") FetchContent_MakeAvailable(curl) # Requires CMake 3.14 +elseif(TEST_INTEGRATION_MODE STREQUAL "ExternalProject") + include(ExternalProject) + set(_curl_install_dir "${CMAKE_BINARY_DIR}/curl-external-install") + set(_curl_static_lib "${_curl_install_dir}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}curl${CMAKE_STATIC_LIBRARY_SUFFIX}") + string(REPLACE " " ";" CURL_TEST_OPTS "${CURL_TEST_OPTS}") + if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.24) + set(_download_extract_timestamp "DOWNLOAD_EXTRACT_TIMESTAMP" "ON") + endif() + ExternalProject_Add(curl-external + URL "${FROM_ARCHIVE}" URL_HASH "SHA256=${FROM_HASH}" + ${_download_extract_timestamp} + PREFIX "${CMAKE_BINARY_DIR}/curl-external" + CMAKE_ARGS "-DCMAKE_INSTALL_PREFIX=${_curl_install_dir}" -DBUILD_SHARED_LIBS=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_PKGCONFIG=OFF + -DCURL_ENABLE_SSL=OFF -DCURL_ENABLE_SSL=OFF -DCURL_DISABLE_LDAP=ON -DCURL_USE_LIBSSH2=OFF -DUSE_NGHTTP2=OFF + -DCURL_BROTLI=OFF -DCURL_ZLIB=OFF -DCURL_ZSTD=OFF -DUSE_LIBIDN2=OFF -DENABLE_IPV6=OFF + ${CURL_TEST_OPTS} + BUILD_BYPRODUCTS "${_curl_static_lib}") + + add_executable(test-consumer-static-fetch "test.c") + add_dependencies(test-consumer-static-fetch curl-external) + if(WIN32) + target_compile_definitions(test-consumer-static-fetch PRIVATE "CURL_STATICLIB") + list(APPEND _curl_static_lib "ws2_32" "bcrypt") + endif() + target_include_directories(test-consumer-static-fetch PRIVATE "${_curl_install_dir}/include") + target_link_libraries(test-consumer-static-fetch PRIVATE "${_curl_static_lib}") endif() -add_executable(test-consumer-static-ns "test.c") -target_link_libraries(test-consumer-static-ns PRIVATE "CURL::libcurl_static") +if(TEST_INTEGRATION_MODE STREQUAL "find_package" OR + TEST_INTEGRATION_MODE STREQUAL "add_subdirectory" OR + TEST_INTEGRATION_MODE STREQUAL "FetchContent") + + add_executable(test-consumer-static-ns "test.c") + target_link_libraries(test-consumer-static-ns PRIVATE "CURL::libcurl_static") -add_executable(test-consumer-shared-ns "test.c") -target_link_libraries(test-consumer-shared-ns PRIVATE "CURL::libcurl_shared") + add_executable(test-consumer-shared-ns "test.c") + target_link_libraries(test-consumer-shared-ns PRIVATE "CURL::libcurl_shared") -# Alias for either shared or static library -add_executable(test-consumer-selected-ns "test.c") -target_link_libraries(test-consumer-selected-ns PRIVATE "CURL::libcurl") + # Alias for either shared or static library + add_executable(test-consumer-selected-ns "test.c") + target_link_libraries(test-consumer-selected-ns PRIVATE "CURL::libcurl") +endif() if(TEST_INTEGRATION_MODE STREQUAL "add_subdirectory" OR TEST_INTEGRATION_MODE STREQUAL "FetchContent") diff --git a/tests/cmake/test.sh b/tests/cmake/test.sh index a1d11e8ad..451235484 100755 --- a/tests/cmake/test.sh +++ b/tests/cmake/test.sh @@ -41,20 +41,20 @@ runresults() { set -x } -if [ "${mode}" = 'ExternalProject' ]; then # Broken +if [ "${mode}" = 'all' ] || [ "${mode}" = 'ExternalProject' ]; then (cd "${src}"; git archive --format=tar HEAD) | gzip > source.tar.gz src="${PWD}/source.tar.gz" sha="$(openssl dgst -sha256 "${src}" | grep -a -i -o -E '[0-9a-f]{64}$')" bldc='bld-externalproject' rm -rf "${bldc}" if [ -n "${cmake_consumer_modern:-}" ]; then # 3.15+ - "${cmake_consumer}" -B "${bldc}" -G "${gen}" ${cmake_opts} -DCMAKE_UNITY_BUILD=ON ${TEST_CMAKE_FLAGS:-} "$@" \ + "${cmake_consumer}" -B "${bldc}" -G "${gen}" ${TEST_CMAKE_FLAGS:-} -DCURL_TEST_OPTS="${cmake_opts} -DCMAKE_UNITY_BUILD=ON $*" \ -DTEST_INTEGRATION_MODE=ExternalProject \ -DFROM_ARCHIVE="${src}" -DFROM_HASH="${sha}" "${cmake_consumer}" --build "${bldc}" --verbose else mkdir "${bldc}"; cd "${bldc}" - "${cmake_consumer}" .. -G "${gen}" ${cmake_opts} ${TEST_CMAKE_FLAGS:-} "$@" \ + "${cmake_consumer}" .. -G "${gen}" ${TEST_CMAKE_FLAGS:-} -DCURL_TEST_OPTS="${cmake_opts} $*" \ -DTEST_INTEGRATION_MODE=ExternalProject \ -DFROM_ARCHIVE="${src}" -DFROM_HASH="${sha}" VERBOSE=1 "${cmake_consumer}" --build . diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am index c01d93eb8..1c0258e17 100644 --- a/tests/data/Makefile.am +++ b/tests/data/Makefile.am @@ -273,7 +273,7 @@ test3000 test3001 test3002 test3003 test3004 test3005 test3006 test3007 \ test3008 test3009 test3010 test3011 test3012 test3013 test3014 test3015 \ test3016 test3017 test3018 test3019 test3020 test3021 test3022 test3023 \ test3024 test3025 test3026 test3027 test3028 test3029 test3030 test3031 \ -test3032 test3033 \ +test3032 test3033 test3034 \ \ test3100 test3101 test3102 test3103 test3104 test3105 \ \ diff --git a/tests/data/test3034 b/tests/data/test3034 new file mode 100644 index 000000000..5b1ace225 --- /dev/null +++ b/tests/data/test3034 @@ -0,0 +1,40 @@ +<testcase> +<info> +<keywords> +CURLOPT_READFUNCTION +curl_easy_reset +rewind +</keywords> +</info> + +# Server side +<reply> +<data nocheck="yes"> +HTTP/1.1 307 Temporary Redirect OK swsclose +Content-Length: 0 +Location: /%TESTNUMBER +</data> +</reply> + +# Client side +<client> +<server> +http +</server> +<tool> +lib%TESTNUMBER +</tool> +<name> +Test reset resolves rewind failure +</name> +<command> +http://%HOSTIP:%HTTPPORT/%TESTNUMBER +</command> +</client> + +<verify> +<errorcode> +0 +</errorcode> +</verify> +</testcase> diff --git a/tests/data/test96 b/tests/data/test96 index 426715a2c..4efc3491a 100644 --- a/tests/data/test96 +++ b/tests/data/test96 @@ -36,6 +36,7 @@ MEM tool_paramhlp.c MEM tool_cfgable.c MEM tool_cfgable.c MEM tool_cfgable.c +MEM tool_cfgable.c </file> <stripfile> $_ = '' if((($_ !~ /tool_paramhlp/) && ($_ !~ /tool_cfgable/)) || ($_ =~ /free\(\(nil\)\)/)) diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc index 770184f71..5e1462108 100644 --- a/tests/libtest/Makefile.inc +++ b/tests/libtest/Makefile.inc @@ -104,6 +104,6 @@ TESTS_C = \ lib2402.c lib2404.c lib2405.c \ lib2502.c \ lib2700.c \ - lib3010.c lib3025.c lib3026.c lib3027.c lib3033.c \ + lib3010.c lib3025.c lib3026.c lib3027.c lib3033.c lib3034.c \ lib3100.c lib3101.c lib3102.c lib3103.c lib3104.c lib3105.c \ lib3207.c lib3208.c diff --git a/tests/libtest/lib3034.c b/tests/libtest/lib3034.c new file mode 100644 index 000000000..b21c68d15 --- /dev/null +++ b/tests/libtest/lib3034.c @@ -0,0 +1,77 @@ +/*************************************************************************** + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * + * Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al. + * + * This software is licensed as described in the file COPYING, which + * you should have received as part of this distribution. The terms + * are also available at https://curl.se/docs/copyright.html. + * + * You may opt to use, copy, modify, merge, publish, distribute and/or sell + * copies of the Software, and permit persons to whom the Software is + * furnished to do so, under the terms of the COPYING file. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + * SPDX-License-Identifier: curl + * + ***************************************************************************/ +#include "first.h" + +static const char data_3034[] = "hello"; + +static size_t t3034_read_cb(char *ptr, size_t size, size_t nmemb, void *userp) +{ + size_t len = size * nmemb; + size_t tocopy = sizeof(data_3034) < len ? sizeof(data_3034) : len; + (void)userp; + memcpy(ptr, data_3034, tocopy); + return tocopy; +} + +static CURLcode test_lib3034(const char *URL) +{ + CURL *curl; + CURLcode res = CURLE_OK; + + global_init(CURL_GLOBAL_ALL); + easy_init(curl); + + /* This first request will receive a redirect response; deliberately only + * set the CURLOPT_READFUNCTION but not the CURLOPT_SEEKFUNCTION to force a + * rewind failure (CURLE_SEND_FAIL_REWIND). + */ + test_setopt(curl, CURLOPT_VERBOSE, 1L); + test_setopt(curl, CURLOPT_URL, URL); + test_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L); + test_setopt(curl, CURLOPT_UPLOAD, 1L); + test_setopt(curl, CURLOPT_INFILESIZE, 5L); + test_setopt(curl, CURLOPT_READFUNCTION, t3034_read_cb); + + res = curl_easy_perform(curl); + if(res != CURLE_SEND_FAIL_REWIND) { + curl_mfprintf(stderr, + "%s:%d curl_easy_perform() failed with code %d (%s)\n", + __FILE__, __LINE__, res, curl_easy_strerror(res)); + goto test_cleanup; + } + + /* Reset the easy handle, which should clear the rewind failure. */ + curl_easy_reset(curl); + + /* Perform a second request, which should succeed. */ + test_setopt(curl, CURLOPT_VERBOSE, 1L); + test_setopt(curl, CURLOPT_URL, URL); + + res = curl_easy_perform(curl); + +test_cleanup: + curl_easy_cleanup(curl); + curl_global_cleanup(); + return res; +} |