luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make resolve part of the bundle again

Browse Source 
Reverts 794642707bbd826161d973a6b62a9d63fb02672f
This commit is contained in:
Viktor Szakats 2025-02-25 03:33:59 +01:00
parent 7bd7628a76
commit 3828693f54
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/server/CMakeLists.txt
View File

@ -22,7 +22,7 @@
#
###########################################################################
# Get 'SERVERPROGS', 'OTHERPROGS', '<target>_SOURCES' variables, 'CURLX_SRCS', 'USEFUL', 'INET_PTON', 'UTIL', 'UTIL_BUNDLE'
# Get 'SERVERPROGS', '<target>_SOURCES' variables, 'CURLX_SRCS', 'USEFUL', 'INET_PTON', 'UTIL', 'UTIL_BUNDLE'
curl_transform_makefile_inc("Makefile.inc" "${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake")
include("${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake")
@ -46,7 +46,7 @@ if(CURL_TEST_BUNDLES)
list(APPEND servers_SOURCES ${CURLX_SRCS} ${USEFUL} ${INET_PTON} ${UTIL} ${UTIL_BUNDLE})
endif()
foreach(_target IN LISTS SERVERPROGS OTHERPROGS)
foreach(_target IN LISTS SERVERPROGS)
set(_target_name "${_target}")
add_executable(${_target_name} EXCLUDE_FROM_ALL ${${_target}_SOURCES})
add_dependencies(testdeps ${_target_name})

4
tests/server/Makefile.am
View File

@ -57,14 +57,14 @@ if USE_TEST_BUNDLES
server_bundle.c: $(top_srcdir)/tests/mk-bundle-server.pl $(CURLX_SRCS) $(USEFUL) $(INET_PTON) $(UTIL) $(UTIL_BUNDLE)
@PERL@ $(top_srcdir)/tests/mk-bundle-server.pl $(SERVERPROGS) > server_bundle.c
noinst_PROGRAMS = servers $(OTHERPROGS)
noinst_PROGRAMS = servers
nodist_servers_SOURCES = server_bundle.c
servers_SOURCES = $(CURLX_SRCS) $(USEFUL) $(INET_PTON) $(UTIL) $(UTIL_BUNDLE)
servers_LDADD = @CURL_NETWORK_AND_TIME_LIBS@
servers_CFLAGS = $(AM_CFLAGS)
CLEANFILES = server_bundle.c
else
noinst_PROGRAMS = $(SERVERPROGS) $(OTHERPROGS)
noinst_PROGRAMS = $(SERVERPROGS)
endif
CHECKSRC = $(CS_$(V))

3
tests/server/Makefile.inc
View File

@ -22,8 +22,7 @@
#
###########################################################################
SERVERPROGS = rtspd sockfilt sws tftpd socksd disabled mqttd
OTHERPROGS = resolve
SERVERPROGS = resolve rtspd sockfilt sws tftpd socksd disabled mqttd
CURLX_SRCS = \
../../lib/mprintf.c \

4
tests/serverhelp.pm
View File

@ -245,7 +245,7 @@ sub server_exe {
$ext = 'SRV';
}
my $cmd;
if($ENV{'CURL_TEST_BUNDLES'} && $name ne 'resolve') {
if($ENV{'CURL_TEST_BUNDLES'}) {
$cmd = $SRVDIR . "servers" . exe_ext($ext) . " $name";
}
else {
@ -264,7 +264,7 @@ sub server_exe_args {
$ext = 'SRV';
}
my @cmd;
if($ENV{'CURL_TEST_BUNDLES'} && $name ne 'resolve') {
if($ENV{'CURL_TEST_BUNDLES'}) {
@cmd = ($SRVDIR . "servers" . exe_ext($ext), $name);
}
else {