mirror of
https://github.com/curl/curl.git
synced 2026-08-24 11:43:38 +03:00
parent
03868ca714
commit
4f0e530c77
11 changed files with 68 additions and 88 deletions
|
|
@ -74,8 +74,8 @@ function(curl_add_runtests _targetname _test_flags)
|
|||
COMMAND
|
||||
${_setenv}
|
||||
"${PERL_EXECUTABLE}" "${CMAKE_CURRENT_SOURCE_DIR}/runtests.pl"
|
||||
${_test_flags_list}
|
||||
"\$TFLAGS"
|
||||
${_test_flags_list}
|
||||
"\$TFLAGS"
|
||||
DEPENDS "${_depends}"
|
||||
VERBATIM USES_TERMINAL
|
||||
)
|
||||
|
|
|
|||
|
|
@ -54,14 +54,14 @@ use servers qw(
|
|||
protoport
|
||||
serverfortest
|
||||
stopservers
|
||||
);
|
||||
);
|
||||
use runner qw(
|
||||
readtestkeywords
|
||||
singletest_preprocess
|
||||
);
|
||||
);
|
||||
use testutil qw(
|
||||
setlogfunc
|
||||
);
|
||||
);
|
||||
use getpart;
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -120,18 +120,15 @@ declare -A neither_targets=(
|
|||
|
||||
DEFPORT=443
|
||||
|
||||
function whenisitagain()
|
||||
{
|
||||
function whenisitagain() {
|
||||
/bin/date -u +%Y%m%d-%H%M%S
|
||||
}
|
||||
|
||||
function fileage()
|
||||
{
|
||||
function fileage() {
|
||||
echo $(($(date +%s) - $(date +%s -r "$1")))
|
||||
}
|
||||
|
||||
function hostport2host()
|
||||
{
|
||||
function hostport2host() {
|
||||
case $1 in
|
||||
*:*) host=${1%:*} port=${1##*:};;
|
||||
*) host=$1 port=$DEFPORT;;
|
||||
|
|
@ -139,8 +136,7 @@ function hostport2host()
|
|||
echo "$host"
|
||||
}
|
||||
|
||||
function hostport2port()
|
||||
{
|
||||
function hostport2port() {
|
||||
case $1 in
|
||||
*:*) host=${1%:*} port=${1##*:};;
|
||||
*) host=$1 port=$DEFPORT;;
|
||||
|
|
@ -148,8 +144,7 @@ function hostport2port()
|
|||
echo "$port"
|
||||
}
|
||||
|
||||
function cli_test()
|
||||
{
|
||||
function cli_test() {
|
||||
# 1st param is target URL
|
||||
turl=$1
|
||||
# 2nd param is 0 if we expect curl to not work or 1 if we expect it
|
||||
|
|
@ -191,8 +186,7 @@ function cli_test()
|
|||
rm -f "$TMPF"
|
||||
}
|
||||
|
||||
function get_ech_configlist()
|
||||
{
|
||||
function get_ech_configlist() {
|
||||
domain=$1
|
||||
ecl=$(dig +short https "$domain" | grep "ech=" | sed -e 's/^.*ech=//' | sed -e 's/ .*//')
|
||||
echo "$ecl"
|
||||
|
|
|
|||
|
|
@ -78,11 +78,11 @@ BEGIN {
|
|||
use pathhelp qw(
|
||||
exe_ext
|
||||
dirsepadd
|
||||
);
|
||||
);
|
||||
use Cwd qw(getcwd);
|
||||
use testutil qw(
|
||||
shell_quote
|
||||
);
|
||||
);
|
||||
use File::Spec;
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ use globalconfig qw(
|
|||
$torture
|
||||
$verbose
|
||||
$dev_null
|
||||
);
|
||||
);
|
||||
|
||||
my $logfunc; # optional reference to function for logging
|
||||
my @logmessages; # array holding logged messages
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue