From: Viktor Szakats Date: Mon, 16 Jun 2025 10:42:19 +0000 (+0200) Subject: tests/http/clients: move to tests/client X-Git-Tag: curl-8_15_0~244 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b7c488f17dd64fe11ded87620a0ba219d7e1ec0;p=thirdparty%2Fcurl.git tests/http/clients: move to tests/client To have all the tests binaries directly under the tests directory. There seems to be no issue adding non-http test clients to this subdir. Closes #17637 --- diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index fd8349e7fe..4ddcae54e6 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -353,7 +353,7 @@ jobs: fi if [ "${MATRIX_BUILD}" != 'cmake' ]; then # avoid libtool's .exe wrappers - mv bld/tests/http/clients/.libs/*.exe bld/tests/http/clients + mv bld/tests/client/.libs/*.exe bld/tests/client mv bld/tests/libtest/.libs/*.exe bld/tests/libtest mv bld/tests/server/.libs/*.exe bld/tests/server mv bld/tests/tunit/.libs/*.exe bld/tests/tunit || true diff --git a/configure.ac b/configure.ac index d178113955..0d5da0073e 100644 --- a/configure.ac +++ b/configure.ac @@ -5429,9 +5429,9 @@ AC_CONFIG_FILES([\ tests/libtest/Makefile \ tests/unit/Makefile \ tests/tunit/Makefile \ + tests/client/Makefile \ tests/http/config.ini \ tests/http/Makefile \ - tests/http/clients/Makefile \ packages/Makefile \ packages/vms/Makefile \ curl-config \ diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 7928b206eb..0cf3e37529 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -35,7 +35,7 @@ if(BUILD_CURL_EXE) endif() add_subdirectory(http) -add_subdirectory(http/clients) +add_subdirectory(client) add_subdirectory(server) add_subdirectory(libtest) add_subdirectory(tunit) @@ -73,7 +73,7 @@ endfunction() function(curl_add_pytests _targetname _test_flags) set(_depends "") if(NOT _targetname STREQUAL "pytest-ci") - set(_depends "http-clients") + set(_depends "clients") endif() string(REPLACE " " ";" _test_flags_list "${_test_flags}") add_custom_target(${_targetname} diff --git a/tests/Makefile.am b/tests/Makefile.am index ed7c55e62e..4978b059f9 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -95,7 +95,7 @@ BUILD_UNIT = DIST_UNIT = unit tunit endif -SUBDIRS = certs data server libtest http $(BUILD_UNIT) +SUBDIRS = certs data server libtest client http $(BUILD_UNIT) DIST_SUBDIRS = $(SUBDIRS) $(DIST_UNIT) PERLFLAGS = -I$(srcdir) @@ -175,6 +175,7 @@ checksrc: (cd unit && $(MAKE) checksrc) (cd tunit && $(MAKE) checksrc) (cd server && $(MAKE) checksrc) + (cd client && $(MAKE) checksrc) (cd http && $(MAKE) checksrc) all-local: $(MANFILES) build-certs diff --git a/tests/http/clients/.gitignore b/tests/client/.gitignore similarity index 100% rename from tests/http/clients/.gitignore rename to tests/client/.gitignore diff --git a/tests/http/clients/CMakeLists.txt b/tests/client/CMakeLists.txt similarity index 81% rename from tests/http/clients/CMakeLists.txt rename to tests/client/CMakeLists.txt index f6c0fb137f..91c3c0ec7b 100644 --- a/tests/http/clients/CMakeLists.txt +++ b/tests/client/CMakeLists.txt @@ -41,18 +41,18 @@ add_custom_command( ${FIRSTFILES} ${_bundle_extra} ${TESTFILES} VERBATIM) -add_executable(http-clients EXCLUDE_FROM_ALL "${BUNDLE_SRC}") -add_dependencies(testdeps http-clients) -target_include_directories(http-clients PRIVATE +add_executable(clients EXCLUDE_FROM_ALL "${BUNDLE_SRC}") +add_dependencies(testdeps clients) +target_include_directories(clients PRIVATE "${PROJECT_BINARY_DIR}/lib" # for "curl_config.h" "${PROJECT_SOURCE_DIR}/lib" # for "curl_setup.h" "${PROJECT_SOURCE_DIR}/lib/curlx" # for curlx "${CMAKE_CURRENT_SOURCE_DIR}" # for "first.h" ) -target_link_libraries(http-clients ${LIB_SELECTED} ${CURL_LIBS}) -set_property(TARGET http-clients APPEND PROPERTY COMPILE_DEFINITIONS "CURL_NO_OLDIES" +target_link_libraries(clients ${LIB_SELECTED} ${CURL_LIBS}) +set_property(TARGET clients APPEND PROPERTY COMPILE_DEFINITIONS "CURL_NO_OLDIES" "$<$:_CRT_SECURE_NO_DEPRECATE>") if(LIB_SELECTED STREQUAL LIB_STATIC AND WIN32) - set_property(TARGET http-clients APPEND PROPERTY COMPILE_DEFINITIONS "CURL_STATICLIB") + set_property(TARGET clients APPEND PROPERTY COMPILE_DEFINITIONS "CURL_STATICLIB") endif() -set_target_properties(http-clients PROPERTIES OUTPUT_NAME "${BUNDLE}" PROJECT_LABEL "Test ${BUNDLE}" UNITY_BUILD OFF) +set_target_properties(clients PROPERTIES OUTPUT_NAME "${BUNDLE}" PROJECT_LABEL "Test ${BUNDLE}" UNITY_BUILD OFF) diff --git a/tests/http/clients/Makefile.am b/tests/client/Makefile.am similarity index 100% rename from tests/http/clients/Makefile.am rename to tests/client/Makefile.am diff --git a/tests/http/clients/Makefile.inc b/tests/client/Makefile.inc similarity index 97% rename from tests/http/clients/Makefile.inc rename to tests/client/Makefile.inc index 52c63390eb..604ff515c9 100644 --- a/tests/http/clients/Makefile.inc +++ b/tests/client/Makefile.inc @@ -30,7 +30,7 @@ BUNDLE_SRC = clients.c FIRSTFILES = first.c first.h CURLX_SRCS = \ - ../../../lib/curlx/multibyte.c + ../../lib/curlx/multibyte.c # All test clients TESTFILES = \ diff --git a/tests/http/clients/first.c b/tests/client/first.c similarity index 100% rename from tests/http/clients/first.c rename to tests/client/first.c diff --git a/tests/http/clients/first.h b/tests/client/first.h similarity index 100% rename from tests/http/clients/first.h rename to tests/client/first.h diff --git a/tests/http/clients/h2_pausing.c b/tests/client/h2_pausing.c similarity index 100% rename from tests/http/clients/h2_pausing.c rename to tests/client/h2_pausing.c diff --git a/tests/http/clients/h2_serverpush.c b/tests/client/h2_serverpush.c similarity index 100% rename from tests/http/clients/h2_serverpush.c rename to tests/client/h2_serverpush.c diff --git a/tests/http/clients/h2_upgrade_extreme.c b/tests/client/h2_upgrade_extreme.c similarity index 100% rename from tests/http/clients/h2_upgrade_extreme.c rename to tests/client/h2_upgrade_extreme.c diff --git a/tests/http/clients/hx_download.c b/tests/client/hx_download.c similarity index 100% rename from tests/http/clients/hx_download.c rename to tests/client/hx_download.c diff --git a/tests/http/clients/hx_upload.c b/tests/client/hx_upload.c similarity index 100% rename from tests/http/clients/hx_upload.c rename to tests/client/hx_upload.c diff --git a/tests/http/clients/tls_session_reuse.c b/tests/client/tls_session_reuse.c similarity index 100% rename from tests/http/clients/tls_session_reuse.c rename to tests/client/tls_session_reuse.c diff --git a/tests/http/clients/upload_pausing.c b/tests/client/upload_pausing.c similarity index 100% rename from tests/http/clients/upload_pausing.c rename to tests/client/upload_pausing.c diff --git a/tests/http/clients/ws_data.c b/tests/client/ws_data.c similarity index 100% rename from tests/http/clients/ws_data.c rename to tests/client/ws_data.c diff --git a/tests/http/clients/ws_pingpong.c b/tests/client/ws_pingpong.c similarity index 100% rename from tests/http/clients/ws_pingpong.c rename to tests/client/ws_pingpong.c diff --git a/tests/http/Makefile.am b/tests/http/Makefile.am index f51fef44cf..2a0c2547f4 100644 --- a/tests/http/Makefile.am +++ b/tests/http/Makefile.am @@ -22,8 +22,6 @@ # ########################################################################### -SUBDIRS = clients - TESTENV = \ testenv/__init__.py \ testenv/caddy.py \ @@ -75,7 +73,4 @@ clean-local: check: clients clients: - @(cd clients; $(MAKE) check) - -checksrc: - cd clients && $(MAKE) checksrc + @(cd ../client; $(MAKE) check) diff --git a/tests/http/testenv/client.py b/tests/http/testenv/client.py index 0b2d9bb4a7..4f690a345e 100644 --- a/tests/http/testenv/client.py +++ b/tests/http/testenv/client.py @@ -44,7 +44,7 @@ class LocalClient: timeout: Optional[float] = None, run_env: Optional[Dict[str,str]] = None): self.name = name - self.path = os.path.join(env.build_dir, 'tests/http/clients/clients') + self.path = os.path.join(env.build_dir, 'tests/client/clients') self.env = env self._run_env = run_env self._timeout = timeout if timeout else env.test_timeout