romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-10 23:10:53 +03:00
Code Issues Projects Releases Packages Wiki Activity

runtests: support running tests under wine or qemu (cont.)

Browse source 
Respect `CURL_TEST_EXE_RUNNER` env in server verifications using
the in-tree curl, in `tests/servers.pm`.

Follow-up to 72b163c301 #16785
Closes #16863
This commit is contained in:
Viktor Szakats 2025-03-28 22:21:06 +01:00
parent 8adee8824c
commit edd6e54e5f
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
tests/servers.pm
View file

@ -112,6 +112,7 @@ use testutil qw(
logmsg
runclient
runclientoutput
exerunner
shell_quote
);
@ -542,7 +543,7 @@ sub verifyhttp {
$flags .= "--http3-only " if($do_http3);
$flags .= "\"$proto://$ip:$port/${bonus}verifiedserver\"";
my $cmd = "$VCURL $flags 2>$verifylog";
my $cmd = exerunner() . "$VCURL $flags 2>$verifylog";
# verify if our/any server is running on this port
logmsg "RUN: $cmd\n" if($verbose);
@ -619,7 +620,7 @@ sub verifyftp {
}
$flags .= "\"$proto://$ip:$port/verifiedserver\"";
my $cmd = "$VCURL $flags 2>$verifylog";
my $cmd = exerunner() . "$VCURL $flags 2>$verifylog";
# check if this is our server running on this port:
logmsg "RUN: $cmd\n" if($verbose);
@ -685,7 +686,7 @@ sub verifyrtsp {
# currently verification is done using http
$flags .= "\"http://$ip:$port/verifiedserver\"";
my $cmd = "$VCURL $flags 2>$verifylog";
my $cmd = exerunner() . "$VCURL $flags 2>$verifylog";
# verify if our/any server is running on this port
logmsg "RUN: $cmd\n" if($verbose);
@ -818,7 +819,7 @@ sub verifyhttptls {
}
$flags .= "\"https://$ip:$port/verifiedserver\"";
my $cmd = "$VCURL $flags 2>$verifylog";
my $cmd = exerunner() . "$VCURL $flags 2>$verifylog";
# verify if our/any server is running on this port
logmsg "RUN: $cmd\n" if($verbose);
@ -919,7 +920,7 @@ sub verifysmb {
$flags .= $extra;
$flags .= "\"$proto://$ip:$port/SERVER/verifiedserver\"";
my $cmd = "$VCURL $flags 2>$verifylog";
my $cmd = exerunner() . "$VCURL $flags 2>$verifylog";
# check if this is our server running on this port:
logmsg "RUN: $cmd\n" if($verbose);
@ -979,7 +980,8 @@ sub verifytelnet {
$flags .= $extra;
$flags .= "\"$proto://$ip:$port\"";
my $cmd = "echo 'verifiedserver' | $VCURL $flags 2>$verifylog";
my $cmd = "echo 'verifiedserver' | " .
exerunner() . "$VCURL $flags 2>$verifylog";
# check if this is our server running on this port:
logmsg "RUN: $cmd\n" if($verbose);