mirror of
https://github.com/curl/curl.git
synced 2026-08-26 07:23:31 +03:00
tidy-up: miscellaneous
- drop stray duplicate empty lines in docs, scripts, test data, include, examples, tests. - drop duplicate PP parenthesis. - curl-functions.m4: move literals to the right side in if expressions, to match rest of the source code. - FAQ.md: delete language designator from an URL. - packages: apply clang-format (OS400, VMS). - scripts/schemetable.c: apply clang-format. - data320: delete duplicate empty line that doesn't change the outcome. - spacecheck: extend to check for duplicate empty lines (with exceptions.) - fix whitespace nits Closes #19936
This commit is contained in:
Viktor Szakats
parent
141ce4be64
commit
fe8393d7db
116 changed files with 674 additions and 1039 deletions
|
|
@ -38,7 +38,6 @@ BEGIN {
|
|||
);
|
||||
}
|
||||
|
||||
|
||||
my %APPVEYOR_TEST_NAMES; # JSON and shell-quoted test names by test number
|
||||
|
||||
sub appveyor_check_environment {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
<HTML><BODY>
|
||||
<CENTER><H1>This is <a href="http://www.gnu.org/software/gnutls">GnuTLS</a></H1></CENTER>
|
||||
|
||||
|
||||
<p>Session ID: <i>003030000100000001000000000000000030330001000000B062410001000000</i></p>
|
||||
<h5>If your browser supports session resuming, then you should see the same session ID, when you press the <b>reload</b> button.</h5>
|
||||
<p>Connected as user 'jsmith'.</p>
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER#test
|
|||
</command>
|
||||
</client>
|
||||
|
||||
|
||||
# Verify data after the test has been "shot"
|
||||
<verify>
|
||||
<protocol crlf="headers">
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER?q=foobar#fragment
|
|||
</command>
|
||||
</client>
|
||||
|
||||
|
||||
# Verify data after the test has been "shot"
|
||||
<verify>
|
||||
<protocol crlf="headers">
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER?q=foobar#fragment#fragment2
|
|||
</command>
|
||||
</client>
|
||||
|
||||
|
||||
# Verify data after the test has been "shot"
|
||||
<verify>
|
||||
<protocol crlf="headers">
|
||||
|
|
|
|||
|
|
@ -49,8 +49,6 @@ Content-Length: 6
|
|||
|
||||
hello
|
||||
</datacheck>
|
||||
|
||||
|
||||
</reply>
|
||||
|
||||
# Client-side
|
||||
|
|
|
|||
|
|
@ -31,8 +31,6 @@ Set-Cookie: time=2
|
|||
|
||||
-foo-
|
||||
</data2>
|
||||
|
||||
|
||||
</reply>
|
||||
|
||||
#
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ FAILURE
|
|||
</keywords>
|
||||
</info>
|
||||
|
||||
|
||||
#
|
||||
# Client-side
|
||||
<client>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ FAILURE
|
|||
</keywords>
|
||||
</info>
|
||||
|
||||
|
||||
#
|
||||
# Client-side
|
||||
<client>
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@ Funny-head: yesyes
|
|||
</data>
|
||||
</reply>
|
||||
|
||||
|
||||
#
|
||||
# Client-side
|
||||
<client>
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
|
|||
</command>
|
||||
</client>
|
||||
|
||||
|
||||
# Verify data after the test has been "shot"
|
||||
<verify>
|
||||
# This does not send QUIT because of known bug:
|
||||
|
|
|
|||
|
|
@ -25,7 +25,6 @@ ensure that the order does not matter. -->
|
|||
|
||||
-->
|
||||
|
||||
|
||||
<!-- First request has NTLM auth, wrong password -->
|
||||
<data100 crlf="headers">
|
||||
HTTP/1.1 401 Need Digest or NTLM auth
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ FTP
|
|||
</keywords>
|
||||
</info>
|
||||
|
||||
|
||||
#
|
||||
# Server-side
|
||||
<reply>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@ connection-monitor
|
|||
auth_required
|
||||
</servercmd>
|
||||
|
||||
|
||||
# this is returned first since we get no proxy-auth
|
||||
<connect crlf="headers">
|
||||
HTTP/1.1 407 Authorization Required to proxy me my dear
|
||||
|
|
|
|||
|
|
@ -50,7 +50,6 @@ client CONNECT 2e 00044d51545404c2003c000c6375726c
|
|||
server CONNACK 2 20020005
|
||||
</protocol>
|
||||
|
||||
|
||||
# 8 is CURLE_WEIRD_SERVER_REPLY
|
||||
<errorcode>
|
||||
8
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ftp-account "one count"
|
|||
</command>
|
||||
</client>
|
||||
|
||||
|
||||
# Verify data after the test has been "shot"
|
||||
<verify>
|
||||
<protocol crlf="yes">
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ curl_multi_remove_handle
|
|||
</keywords>
|
||||
</info>
|
||||
|
||||
|
||||
#
|
||||
# Client-side
|
||||
<client>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ URL
|
|||
</keywords>
|
||||
</info>
|
||||
|
||||
|
||||
#
|
||||
# Client-side
|
||||
<client>
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ftp-account "one count" ftp://%HOSTIP:%FTPP
|
|||
</command>
|
||||
</client>
|
||||
|
||||
|
||||
# Verify data after the test has been "shot"
|
||||
<verify>
|
||||
<protocol crlf="yes">
|
||||
|
|
|
|||
|
|
@ -64,7 +64,6 @@ use testutil qw(
|
|||
);
|
||||
use getpart;
|
||||
|
||||
|
||||
#######################################################################
|
||||
# logmsg is our general message logging subroutine.
|
||||
# This function is currently required to be here by servers.pm
|
||||
|
|
@ -105,7 +104,6 @@ sub parseprotocols {
|
|||
push @protocols, 'none';
|
||||
}
|
||||
|
||||
|
||||
#######################################################################
|
||||
# Initialize @protocols from the curl binary under test
|
||||
#
|
||||
|
|
@ -117,7 +115,6 @@ sub init_protocols {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
#######################################################################
|
||||
# Initialize the test harness to run tests
|
||||
#
|
||||
|
|
|
|||
|
|
@ -37,7 +37,6 @@ BEGIN {
|
|||
);
|
||||
}
|
||||
|
||||
|
||||
my %file_chmod1 = (
|
||||
'name' => 'chmod1',
|
||||
'content' => "This file should have permissions 444\n",
|
||||
|
|
|
|||
|
|
@ -103,8 +103,8 @@ sub getpartattr {
|
|||
if(!$inside && ($_ =~ /^ *\<$section/)) {
|
||||
$inside++;
|
||||
}
|
||||
if((1 ==$inside) && ( ($_ =~ /^ *\<$part ([^>]*)/) ||
|
||||
!(defined($part)) )
|
||||
if((1 == $inside) && (($_ =~ /^ *\<$part ([^>]*)/) ||
|
||||
!(defined($part)))
|
||||
) {
|
||||
$inside++;
|
||||
my $attr=$1;
|
||||
|
|
@ -118,10 +118,10 @@ sub getpartattr {
|
|||
last;
|
||||
}
|
||||
# detect end of section when part was not found
|
||||
elsif((1 ==$inside) && ($_ =~ /^ *\<\/$section\>/)) {
|
||||
elsif((1 == $inside) && ($_ =~ /^ *\<\/$section\>/)) {
|
||||
last;
|
||||
}
|
||||
elsif((2 ==$inside) && ($_ =~ /^ *\<\/$part/)) {
|
||||
elsif((2 == $inside) && ($_ =~ /^ *\<\/$part/)) {
|
||||
$inside--;
|
||||
}
|
||||
}
|
||||
|
|
@ -252,7 +252,6 @@ sub loadtest {
|
|||
return 0;
|
||||
}
|
||||
|
||||
|
||||
# Return entire document as list of lines
|
||||
sub fulltest {
|
||||
return @xml;
|
||||
|
|
@ -323,7 +322,6 @@ sub savetest {
|
|||
# Strip off all lines that match the specified pattern and return
|
||||
# the new array.
|
||||
#
|
||||
|
||||
sub striparray {
|
||||
my ($pattern, $arrayref) = @_;
|
||||
|
||||
|
|
@ -423,5 +421,4 @@ sub loadarray {
|
|||
return @array;
|
||||
}
|
||||
|
||||
|
||||
1;
|
||||
|
|
|
|||
|
|
@ -85,7 +85,6 @@ use pathhelp qw(
|
|||
use Cwd qw(getcwd);
|
||||
use File::Spec;
|
||||
|
||||
|
||||
#######################################################################
|
||||
# global configuration variables
|
||||
#
|
||||
|
|
|
|||
|
|
@ -21,12 +21,10 @@
|
|||
* SPDX-License-Identifier: curl
|
||||
*
|
||||
***************************************************************************/
|
||||
|
||||
#include "first.h"
|
||||
|
||||
#include "testtrace.h"
|
||||
|
||||
|
||||
#ifndef CURL_DISABLE_FTP
|
||||
|
||||
struct test_cli_ftp_upload_data {
|
||||
|
|
@ -85,8 +83,7 @@ static CURLcode test_cli_ftp_upload(const char *URL)
|
|||
curl_off_t uploadsize = -1;
|
||||
|
||||
(void)URL;
|
||||
while((ch = cgetopt(test_argc, test_argv, "r:"))
|
||||
!= -1) {
|
||||
while((ch = cgetopt(test_argc, test_argv, "r:")) != -1) {
|
||||
switch(ch) {
|
||||
case 'r':
|
||||
resolve = coptarg;
|
||||
|
|
|
|||
|
|
@ -55,7 +55,6 @@ static CURLcode test_lib651(const char *URL)
|
|||
if(formrc)
|
||||
curl_mprintf("curl_formadd(1) = %d\n", formrc);
|
||||
|
||||
|
||||
curl = curl_easy_init();
|
||||
if(!curl) {
|
||||
curl_mfprintf(stderr, "curl_easy_init() failed\n");
|
||||
|
|
|
|||
|
|
@ -74,7 +74,6 @@ my @not_built_in_num = (
|
|||
'CURLOPT_SOCKS5_AUTH',
|
||||
);
|
||||
|
||||
|
||||
#
|
||||
# Generate a set of string checks
|
||||
#
|
||||
|
|
@ -626,7 +625,6 @@ MOO
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
print $fh <<FOOTER
|
||||
|
||||
/* NOLINTNEXTLINE(clang-analyzer-optin.core.EnumCastOutOfRange) */
|
||||
|
|
|
|||
|
|
@ -92,6 +92,7 @@
|
|||
goto unit_test_abort; \
|
||||
} while(0)
|
||||
|
||||
/* begin/end macros */
|
||||
|
||||
#define UNITTEST_BEGIN_SIMPLE \
|
||||
(void)arg; \
|
||||
|
|
|
|||
|
|
@ -43,12 +43,10 @@ log = logging.getLogger(__name__)
|
|||
HOST = "localhost"
|
||||
IDENT = "NTEL"
|
||||
|
||||
|
||||
# The strings that indicate the test framework is checking our aliveness
|
||||
VERIFIED_REQ = "verifiedserver"
|
||||
VERIFIED_RSP = "WE ROOLZ: {pid}"
|
||||
|
||||
|
||||
def telnetserver(options):
|
||||
"""Start up a TCP server with a telnet handler and serve DICT requests forever."""
|
||||
if options.pidfile:
|
||||
|
|
@ -69,7 +67,6 @@ def telnetserver(options):
|
|||
# leaving `with` calls server.close() automatically
|
||||
return ScriptRC.SUCCESS
|
||||
|
||||
|
||||
class NegotiatingTelnetHandler(socketserver.BaseRequestHandler):
|
||||
"""Handler class for Telnet connections."""
|
||||
|
||||
|
|
@ -113,7 +110,6 @@ class NegotiatingTelnetHandler(socketserver.BaseRequestHandler):
|
|||
except IOError:
|
||||
log.exception("IOError hit during request")
|
||||
|
||||
|
||||
class Negotiator(object):
|
||||
NO_NEG = 0
|
||||
START_NEG = 1
|
||||
|
|
@ -242,7 +238,6 @@ class Negotiator(object):
|
|||
log.debug("Sending WONT %s", option_str)
|
||||
self.send_iac([NegTokens.WONT, NegOptions.to_val(option_str)])
|
||||
|
||||
|
||||
class NegBase(object):
|
||||
@classmethod
|
||||
def to_val(cls, name):
|
||||
|
|
@ -256,7 +251,6 @@ class NegBase(object):
|
|||
|
||||
return "<unknown>"
|
||||
|
||||
|
||||
class NegTokens(NegBase):
|
||||
# The start of a negotiation sequence
|
||||
IAC = 255
|
||||
|
|
@ -274,7 +268,6 @@ class NegTokens(NegBase):
|
|||
# The end of sub-negotiation options.
|
||||
SE = 240
|
||||
|
||||
|
||||
class NegOptions(NegBase):
|
||||
# Binary Transmission
|
||||
BINARY = 0
|
||||
|
|
@ -287,7 +280,6 @@ class NegOptions(NegBase):
|
|||
# Charset option
|
||||
CHARSET = 42
|
||||
|
||||
|
||||
def get_options():
|
||||
parser = argparse.ArgumentParser()
|
||||
|
||||
|
|
@ -306,7 +298,6 @@ def get_options():
|
|||
|
||||
return parser.parse_args()
|
||||
|
||||
|
||||
def setup_logging(options):
|
||||
"""Set up logging from the command line options."""
|
||||
root_logger = logging.getLogger()
|
||||
|
|
@ -339,7 +330,6 @@ def setup_logging(options):
|
|||
stdout_handler.setLevel(logging.DEBUG)
|
||||
root_logger.addHandler(stdout_handler)
|
||||
|
||||
|
||||
class ScriptRC(object):
|
||||
"""Enum for script return codes."""
|
||||
|
||||
|
|
@ -347,7 +337,6 @@ class ScriptRC(object):
|
|||
FAILURE = 1
|
||||
EXCEPTION = 2
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
# Get the options from the user.
|
||||
options = get_options()
|
||||
|
|
|
|||
|
|
@ -67,7 +67,6 @@ BEGIN {
|
|||
);
|
||||
}
|
||||
|
||||
|
||||
#######################################################################
|
||||
# Block for cached static variables
|
||||
#
|
||||
|
|
|
|||
|
|
@ -468,7 +468,6 @@ sub killallsockfilters {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
sub set_advisor_read_lock {
|
||||
my ($filename) = @_;
|
||||
|
||||
|
|
@ -479,7 +478,6 @@ sub set_advisor_read_lock {
|
|||
printf "Error creating lock file $filename error: $!\n";
|
||||
}
|
||||
|
||||
|
||||
sub clear_advisor_read_lock {
|
||||
my ($filename) = @_;
|
||||
|
||||
|
|
@ -488,5 +486,4 @@ sub clear_advisor_read_lock {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
1;
|
||||
|
|
|
|||
|
|
@ -111,7 +111,6 @@ use testutil qw(
|
|||
use valgrind;
|
||||
use memanalyzer;
|
||||
|
||||
|
||||
#######################################################################
|
||||
# Global variables set elsewhere but used only by this package
|
||||
# These may only be set *before* runner_init is called
|
||||
|
|
@ -384,7 +383,6 @@ sub prepro {
|
|||
return @out;
|
||||
}
|
||||
|
||||
|
||||
#######################################################################
|
||||
# Load test keywords into %keywords hash
|
||||
#
|
||||
|
|
@ -399,7 +397,6 @@ sub readtestkeywords {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
#######################################################################
|
||||
# Return a list of log locks that still exist
|
||||
#
|
||||
|
|
@ -585,7 +582,6 @@ sub torture {
|
|||
return 0;
|
||||
}
|
||||
|
||||
|
||||
#######################################################################
|
||||
# restore environment variables that were modified in test
|
||||
sub restore_test_env {
|
||||
|
|
@ -603,7 +599,6 @@ sub restore_test_env {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
#######################################################################
|
||||
# Start the servers needed to run this test case
|
||||
sub singletest_startservers {
|
||||
|
|
@ -639,7 +634,6 @@ sub singletest_startservers {
|
|||
return ($why, $error);
|
||||
}
|
||||
|
||||
|
||||
#######################################################################
|
||||
# Generate preprocessed test file
|
||||
sub singletest_preprocess {
|
||||
|
|
@ -663,7 +657,6 @@ sub singletest_preprocess {
|
|||
loadtest("$LOGDIR/test${testnum}");
|
||||
}
|
||||
|
||||
|
||||
#######################################################################
|
||||
# Set up the test environment to run this test case
|
||||
sub singletest_setenv {
|
||||
|
|
@ -693,7 +686,6 @@ sub singletest_setenv {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
#######################################################################
|
||||
# Check that test environment is fine to run this test case
|
||||
sub singletest_precheck {
|
||||
|
|
@ -731,7 +723,6 @@ sub singletest_precheck {
|
|||
return $why;
|
||||
}
|
||||
|
||||
|
||||
#######################################################################
|
||||
# Prepare the test environment to run this test case
|
||||
sub singletest_prepare {
|
||||
|
|
@ -804,7 +795,6 @@ sub singletest_prepare {
|
|||
return 0;
|
||||
}
|
||||
|
||||
|
||||
#######################################################################
|
||||
# Run the test command
|
||||
sub singletest_run {
|
||||
|
|
@ -1072,7 +1062,6 @@ sub singletest_run {
|
|||
return (0, $cmdres, $dumped_core, $CURLOUT, $tool, use_valgrind() && !$disablevalgrind);
|
||||
}
|
||||
|
||||
|
||||
#######################################################################
|
||||
# Clean up after test command
|
||||
sub singletest_clean {
|
||||
|
|
@ -1181,7 +1170,6 @@ sub singletest_postcheck {
|
|||
return 0;
|
||||
}
|
||||
|
||||
|
||||
###################################################################
|
||||
# Get ready to run a single test case
|
||||
sub runner_test_preprocess {
|
||||
|
|
@ -1239,7 +1227,6 @@ sub runner_test_preprocess {
|
|||
return ($why, $error, clearlogs(), \%testtimings);
|
||||
}
|
||||
|
||||
|
||||
###################################################################
|
||||
# Run a single test case with an environment that already been prepared
|
||||
# Returns 0=success, -1=skippable failure, -2=permanent error,
|
||||
|
|
@ -1437,7 +1424,6 @@ sub runnerar_ready {
|
|||
return (undef, undef);
|
||||
}
|
||||
|
||||
|
||||
###################################################################
|
||||
# Cleanly abort and exit the runner
|
||||
# This uses print since there is no longer any controller to write logs.
|
||||
|
|
@ -1537,5 +1523,4 @@ sub runner_shutdown {
|
|||
undef $runnerw;
|
||||
}
|
||||
|
||||
|
||||
1;
|
||||
|
|
|
|||
|
|
@ -220,6 +220,7 @@ sub logmsg_bufferfortest {
|
|||
$singletest_bufferedrunner = $runnerid;
|
||||
}
|
||||
}
|
||||
|
||||
#######################################################################
|
||||
# Store a log message in a buffer for this test
|
||||
# The messages can then be displayed all at once at the end of the test
|
||||
|
|
@ -325,7 +326,6 @@ if($ENV{"NGHTTPX"}) {
|
|||
chomp $nghttpx_h3;
|
||||
}
|
||||
|
||||
|
||||
#######################################################################
|
||||
# Get the list of tests that the tests/data/Makefile.am knows about!
|
||||
#
|
||||
|
|
@ -344,7 +344,6 @@ sub get_disttests {
|
|||
close($dh);
|
||||
}
|
||||
|
||||
|
||||
#######################################################################
|
||||
# Remove all files in the specified directory
|
||||
#
|
||||
|
|
@ -381,7 +380,6 @@ sub cleardir {
|
|||
return $done;
|
||||
}
|
||||
|
||||
|
||||
#######################################################################
|
||||
# Given two array references, this function will store them in two temporary
|
||||
# files, run 'diff' on them, store the result and return the diff output!
|
||||
|
|
@ -424,7 +422,6 @@ sub showdiff {
|
|||
return @out;
|
||||
}
|
||||
|
||||
|
||||
#######################################################################
|
||||
# compare test results with the expected output, we might filter off
|
||||
# some pattern that is allowed to differ, output test results
|
||||
|
|
@ -951,7 +948,6 @@ sub timestampskippedevents {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
# Setup CI Test Run
|
||||
sub citest_starttestrun {
|
||||
if(azure_check_environment()) {
|
||||
|
|
@ -961,7 +957,6 @@ sub citest_starttestrun {
|
|||
# Appveyor does not require anything here
|
||||
}
|
||||
|
||||
|
||||
# Register the test case with the CI runner
|
||||
sub citest_starttest {
|
||||
my $testnum = $_[0];
|
||||
|
|
@ -979,7 +974,6 @@ sub citest_starttest {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
# Submit the test case result with the CI runner
|
||||
sub citest_finishtest {
|
||||
my ($testnum, $error) = @_;
|
||||
|
|
@ -1001,7 +995,6 @@ sub citest_finishtestrun {
|
|||
# Appveyor does not require anything here
|
||||
}
|
||||
|
||||
|
||||
# add one set of test timings from the runner to global set
|
||||
sub updatetesttimings {
|
||||
my ($testnum, %testtimings)=@_;
|
||||
|
|
@ -1026,7 +1019,6 @@ sub updatetesttimings {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
#######################################################################
|
||||
# Return the log directory for the given test runner
|
||||
sub getrunnernumlogdir {
|
||||
|
|
@ -1050,7 +1042,6 @@ sub getrunnerlogdir {
|
|||
die "Internal error: runner ID $runnerid not found";
|
||||
}
|
||||
|
||||
|
||||
#######################################################################
|
||||
# Verify that this test case should be run
|
||||
sub singletest_shouldrun {
|
||||
|
|
@ -1195,7 +1186,6 @@ sub singletest_shouldrun {
|
|||
return ($why, $errorreturncode);
|
||||
}
|
||||
|
||||
|
||||
#######################################################################
|
||||
# Print the test name and count tests
|
||||
sub singletest_count {
|
||||
|
|
@ -1903,7 +1893,6 @@ sub singletest_check {
|
|||
return 0;
|
||||
}
|
||||
|
||||
|
||||
#######################################################################
|
||||
# Report a successful test
|
||||
sub singletest_success {
|
||||
|
|
@ -2105,7 +2094,6 @@ sub singletest {
|
|||
return ($cmdres, 0);
|
||||
}
|
||||
|
||||
|
||||
#######################################################################
|
||||
# Report a successful test
|
||||
singletest_success($testnum, $count, $total, ignoreresultcode($testnum));
|
||||
|
|
@ -2763,7 +2751,6 @@ if(!$listonly) {
|
|||
#######################################################################
|
||||
# Fetch all disabled tests, if there are any
|
||||
#
|
||||
|
||||
sub disabledtests {
|
||||
my ($file) = @_;
|
||||
my @input;
|
||||
|
|
@ -3129,8 +3116,8 @@ while() {
|
|||
$total++; # number of tests we have run
|
||||
$executed++;
|
||||
|
||||
if($error>0) {
|
||||
if($error==2) {
|
||||
if($error > 0) {
|
||||
if($error == 2) {
|
||||
# ignored test failures
|
||||
$failedign .= "$testnum ";
|
||||
}
|
||||
|
|
@ -3151,7 +3138,7 @@ while() {
|
|||
# display all files in $LOGDIR/ in a nice way
|
||||
displaylogs($ridready, $testnum);
|
||||
}
|
||||
if($error==2) {
|
||||
if($error == 2) {
|
||||
$ign++; # ignored test result counter
|
||||
}
|
||||
elsif(!$anyway) {
|
||||
|
|
@ -3255,7 +3242,7 @@ if(%skipped && !$short) {
|
|||
my $r = $_;
|
||||
my $skip_count = $skipped{$r};
|
||||
my $log_line = sprintf("TESTINFO: \"%s\" %d time%s (", $r, $skip_count,
|
||||
($skip_count == 1) ? "" : "s");
|
||||
($skip_count == 1) ? "" : "s");
|
||||
|
||||
# now gather all test case numbers that had this reason for being
|
||||
# skipped
|
||||
|
|
|
|||
|
|
@ -90,7 +90,6 @@ sub logmsg {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Return server characterization factors given a server id string.
|
||||
#
|
||||
|
|
@ -118,7 +117,6 @@ sub serverfactors {
|
|||
return($proto, $ipvnum, $idnum);
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Return server name string formatted for presentation purposes
|
||||
#
|
||||
|
|
@ -142,7 +140,6 @@ sub servername_str {
|
|||
return "${proto}${idnum}${ipver}";
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Return server name string formatted for identification purposes
|
||||
#
|
||||
|
|
@ -151,7 +148,6 @@ sub servername_id {
|
|||
return lc(servername_str($proto, $ipver, $idnum));
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Return server name string formatted for filename purposes
|
||||
#
|
||||
|
|
@ -163,7 +159,6 @@ sub servername_canon {
|
|||
return $string;
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Return filename for server pid file.
|
||||
#
|
||||
|
|
@ -182,7 +177,6 @@ sub server_portfilename {
|
|||
return "${piddir}/". servername_canon($proto, $ipver, $idnum) ."$trailer";
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Return filename for server log file.
|
||||
#
|
||||
|
|
@ -193,7 +187,6 @@ sub server_logfilename {
|
|||
return "${logdir}/". servername_canon($proto, $ipver, $idnum) ."$trailer";
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Return filename for server commands file.
|
||||
#
|
||||
|
|
@ -203,7 +196,6 @@ sub server_cmdfilename {
|
|||
return "${logdir}/". servername_canon($proto, $ipver, $idnum) ."$trailer";
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Return filename for server input file.
|
||||
#
|
||||
|
|
@ -213,7 +205,6 @@ sub server_inputfilename {
|
|||
return "${logdir}/". servername_canon($proto, $ipver, $idnum) ."$trailer";
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Return filename for server output file.
|
||||
#
|
||||
|
|
@ -223,7 +214,6 @@ sub server_outputfilename {
|
|||
return "${logdir}/". servername_canon($proto, $ipver, $idnum) ."$trailer";
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Return filename for a server executable
|
||||
#
|
||||
|
|
@ -235,7 +225,6 @@ sub server_exe {
|
|||
return exerunner() . $SRVDIR . "servers" . exe_ext($ext) . " $name";
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Return filename for a server executable as an argument list
|
||||
#
|
||||
|
|
@ -251,7 +240,6 @@ sub server_exe_args {
|
|||
return @cmd;
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Return filename for main or primary sockfilter pid file.
|
||||
#
|
||||
|
|
@ -263,7 +251,6 @@ sub mainsockf_pidfilename {
|
|||
return "${piddir}/". servername_canon($proto, $ipver, $idnum) ."$trailer";
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Return filename for main or primary sockfilter log file.
|
||||
#
|
||||
|
|
@ -275,7 +262,6 @@ sub mainsockf_logfilename {
|
|||
return "${logdir}/". servername_canon($proto, $ipver, $idnum) ."$trailer";
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Return filename for data or secondary sockfilter pid file.
|
||||
#
|
||||
|
|
@ -287,7 +273,6 @@ sub datasockf_pidfilename {
|
|||
return "${piddir}/". servername_canon($proto, $ipver, $idnum) ."$trailer";
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Return filename for data or secondary sockfilter log file.
|
||||
#
|
||||
|
|
@ -299,7 +284,6 @@ sub datasockf_logfilename {
|
|||
return "${logdir}/". servername_canon($proto, $ipver, $idnum) ."$trailer";
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# End of library
|
||||
1;
|
||||
|
|
|
|||
|
|
@ -117,7 +117,6 @@ use testutil qw(
|
|||
exerunner
|
||||
);
|
||||
|
||||
|
||||
my %serverpidfile; # all server pid filenames, identified by server id
|
||||
my %serverportfile;# all server port filenames, identified by server id
|
||||
my $sshdvernum; # for socks server, ssh daemon version number
|
||||
|
|
@ -150,7 +149,6 @@ our $err_unexpected; # error instead of warning on server unexpectedly alive
|
|||
our $debugprotocol; # nonzero for verbose server logs
|
||||
our $stunnel; # path to stunnel command
|
||||
|
||||
|
||||
#######################################################################
|
||||
# Check for a command in the PATH of the test server.
|
||||
#
|
||||
|
|
@ -266,7 +264,6 @@ sub init_serverpidfile_hash {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
#######################################################################
|
||||
# Check if a given child process has just died. Reaps it if so.
|
||||
#
|
||||
|
|
@ -280,7 +277,6 @@ sub checkdied {
|
|||
return ($rc == $pid)?1:0;
|
||||
}
|
||||
|
||||
|
||||
##############################################################################
|
||||
# This function makes sure the right set of server is running for the
|
||||
# specified test case. This is a useful design when we run single tests as not
|
||||
|
|
@ -331,7 +327,6 @@ sub serverfortest {
|
|||
return &startservers(@what);
|
||||
}
|
||||
|
||||
|
||||
#######################################################################
|
||||
# Start a new thread/process and run the given command line in there.
|
||||
# Return the pids (yes plural) of the new child process to the parent.
|
||||
|
|
@ -410,7 +405,6 @@ sub startnew {
|
|||
return ($child, $pid2);
|
||||
}
|
||||
|
||||
|
||||
#######################################################################
|
||||
# Return the port to use for the given protocol.
|
||||
#
|
||||
|
|
@ -419,7 +413,6 @@ sub protoport {
|
|||
return $PORT{$proto} || "[not running]";
|
||||
}
|
||||
|
||||
|
||||
#######################################################################
|
||||
# Stop a test server along with pids which are not in the %run hash yet.
|
||||
# This also stops all servers which are relative to the given one.
|
||||
|
|
@ -506,7 +499,6 @@ sub stopserver {
|
|||
return $result;
|
||||
}
|
||||
|
||||
|
||||
#######################################################################
|
||||
# Return flags to let curl use an external HTTP proxy
|
||||
#
|
||||
|
|
@ -1072,7 +1064,6 @@ sub responsiveserver {
|
|||
return 0;
|
||||
}
|
||||
|
||||
|
||||
#######################################################################
|
||||
# start the http server
|
||||
#
|
||||
|
|
@ -1167,7 +1158,6 @@ sub runhttpserver {
|
|||
return (0, $httppid, $pid2, $port);
|
||||
}
|
||||
|
||||
|
||||
#######################################################################
|
||||
# start the http2 server
|
||||
#
|
||||
|
|
@ -1790,7 +1780,6 @@ sub runrtspserver {
|
|||
return (0, $rtsppid, $pid2, $port);
|
||||
}
|
||||
|
||||
|
||||
#######################################################################
|
||||
# Start the ssh (scp/sftp) server
|
||||
#
|
||||
|
|
@ -2237,7 +2226,6 @@ sub runnegtelnetserver {
|
|||
return (0+!$ntelpid, $ntelpid, $pid2, $port);
|
||||
}
|
||||
|
||||
|
||||
#######################################################################
|
||||
# Single shot http and gopher server responsiveness test. This should only
|
||||
# be used to verify that a server present in %run hash is still functional
|
||||
|
|
@ -3084,7 +3072,6 @@ sub stopservers {
|
|||
return $result;
|
||||
}
|
||||
|
||||
|
||||
#######################################################################
|
||||
# substitute the variable stuff into either a joined up file or
|
||||
# a command, in either case passed by reference
|
||||
|
|
|
|||
|
|
@ -54,7 +54,6 @@ TESTS_MAGIC = "TESTS_MAGIC"
|
|||
VERIFIED_REQ = "verifiedserver"
|
||||
VERIFIED_RSP = "WE ROOLZ: {pid}\n"
|
||||
|
||||
|
||||
class ShutdownHandler(threading.Thread):
|
||||
"""
|
||||
Cleanly shut down the SMB server.
|
||||
|
|
|
|||
|
|
@ -98,7 +98,6 @@ our $hstpubsha256f = 'curl_host_rsa_key.pub_sha256'; # sha256 hash of host pu
|
|||
our $cliprvkeyf = 'curl_client_key'; # client private key file
|
||||
our $clipubkeyf = 'curl_client_key.pub'; # client public key file
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Absolute paths where to look for sftp-server plugin, when not in PATH
|
||||
#
|
||||
|
|
@ -124,7 +123,6 @@ our @sftppath = qw(
|
|||
/opt/ssh/libexec
|
||||
);
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Absolute paths where to look for httptlssrv (gnutls-serv), when not in PATH
|
||||
#
|
||||
|
|
@ -148,7 +146,6 @@ our @httptlssrvpath = qw(
|
|||
/opt/gnutls/libexec
|
||||
);
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Create or overwrite the given file with lines from an array of strings
|
||||
#
|
||||
|
|
@ -174,7 +171,6 @@ sub dump_array {
|
|||
return $error;
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Display contents of the given file
|
||||
#
|
||||
|
|
@ -190,7 +186,6 @@ sub display_file {
|
|||
print "=== End of file $filename\n";
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Display first line of the given file
|
||||
#
|
||||
|
|
@ -205,7 +200,6 @@ sub display_file_top {
|
|||
print "=== End of file $filename\n";
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Display contents of the ssh daemon config file
|
||||
#
|
||||
|
|
@ -213,7 +207,6 @@ sub display_sshdconfig {
|
|||
display_file($sshdconfig);
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Display contents of the ssh client config file
|
||||
#
|
||||
|
|
@ -221,7 +214,6 @@ sub display_sshconfig {
|
|||
display_file($sshconfig);
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Display contents of the sftp client config file
|
||||
#
|
||||
|
|
@ -229,7 +221,6 @@ sub display_sftpconfig {
|
|||
display_file($sftpconfig);
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Display contents of the ssh daemon log file
|
||||
#
|
||||
|
|
@ -238,7 +229,6 @@ sub display_sshdlog {
|
|||
display_file($sshdlog);
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Display contents of the ssh client log file
|
||||
#
|
||||
|
|
@ -247,7 +237,6 @@ sub display_sshlog {
|
|||
display_file($sshlog);
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Display contents of the sftp client log file
|
||||
#
|
||||
|
|
@ -256,7 +245,6 @@ sub display_sftplog {
|
|||
display_file($sftplog);
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Find a file somewhere in the given path
|
||||
#
|
||||
|
|
@ -273,7 +261,6 @@ sub find_file {
|
|||
return "";
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Find an executable file somewhere in the given path
|
||||
#
|
||||
|
|
@ -292,7 +279,6 @@ sub find_exe_file {
|
|||
return "";
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Find a file in environment path or in our sftppath
|
||||
#
|
||||
|
|
@ -304,7 +290,6 @@ sub find_file_spath {
|
|||
return find_file($filename, @spath);
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Find an executable file in environment path or in our httptlssrvpath
|
||||
#
|
||||
|
|
@ -316,7 +301,6 @@ sub find_exe_file_hpath {
|
|||
return find_exe_file($filename, @hpath);
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Find ssh daemon and return canonical filename
|
||||
#
|
||||
|
|
@ -324,7 +308,6 @@ sub find_sshd {
|
|||
return find_file_spath($sshdexe);
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Find ssh client and return canonical filename
|
||||
#
|
||||
|
|
@ -332,7 +315,6 @@ sub find_ssh {
|
|||
return find_file_spath($sshexe);
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Find sftp-server plugin and return canonical filename
|
||||
#
|
||||
|
|
@ -340,7 +322,6 @@ sub find_sftpsrv {
|
|||
return find_file_spath($sftpsrvexe);
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Find sftp client and return canonical filename
|
||||
#
|
||||
|
|
@ -348,7 +329,6 @@ sub find_sftp {
|
|||
return find_file_spath($sftpexe);
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Find ssh-keygen and return canonical filename
|
||||
#
|
||||
|
|
@ -356,7 +336,6 @@ sub find_sshkeygen {
|
|||
return find_file_spath($sshkeygenexe);
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Find httptlssrv (gnutls-serv) and return canonical filename
|
||||
#
|
||||
|
|
@ -376,7 +355,6 @@ sub find_httptlssrv {
|
|||
return "";
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Return version info for the given ssh client or server binaries
|
||||
#
|
||||
|
|
@ -437,7 +415,6 @@ sub sshversioninfo {
|
|||
return ($sshid, $versnum, $versstr, $error);
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# End of library
|
||||
1;
|
||||
|
|
|
|||
|
|
@ -225,7 +225,6 @@ $logfile = "$logdir/sshserver.log"; # used by logmsg
|
|||
#
|
||||
my $loglevel = $debugprotocol?'DEBUG3':'DEBUG2';
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Validate username
|
||||
#
|
||||
|
|
@ -240,7 +239,6 @@ if($error) {
|
|||
exit 1;
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Find out ssh daemon canonical filename
|
||||
#
|
||||
|
|
@ -250,7 +248,6 @@ if(!$sshd) {
|
|||
exit 1;
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Find out ssh daemon version info
|
||||
#
|
||||
|
|
@ -263,7 +260,6 @@ if(!$sshdid) {
|
|||
}
|
||||
logmsg "ssh server found $sshd is $sshdverstr\n" if($verbose);
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# ssh daemon command line options we might use and version support
|
||||
#
|
||||
|
|
@ -281,7 +277,6 @@ logmsg "ssh server found $sshd is $sshdverstr\n" if($verbose);
|
|||
# -t: test config file : SunSSH 1.0.0 and later
|
||||
# -?: sshd version info : SunSSH 1.0.0 and later
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Verify minimum ssh daemon version
|
||||
#
|
||||
|
|
@ -291,7 +286,6 @@ if((($sshdid =~ /OpenSSH/) && ($sshdvernum < 299)) ||
|
|||
exit 1;
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Find out sftp server plugin canonical filename
|
||||
#
|
||||
|
|
@ -302,7 +296,6 @@ if(!$sftpsrv) {
|
|||
}
|
||||
logmsg "sftp server plugin found $sftpsrv\n" if($verbose);
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Find out sftp client canonical filename
|
||||
#
|
||||
|
|
@ -313,7 +306,6 @@ if(!$sftp) {
|
|||
}
|
||||
logmsg "sftp client found $sftp\n" if($verbose);
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Find out ssh keygen canonical filename
|
||||
#
|
||||
|
|
@ -324,7 +316,6 @@ if(!$sshkeygen) {
|
|||
}
|
||||
logmsg "ssh keygen found $sshkeygen\n" if($verbose);
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Find out ssh client canonical filename
|
||||
#
|
||||
|
|
@ -334,7 +325,6 @@ if(!$ssh) {
|
|||
exit 1;
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Find out ssh client version info
|
||||
#
|
||||
|
|
@ -347,7 +337,6 @@ if(!$sshid) {
|
|||
}
|
||||
logmsg "ssh client found $ssh is $sshverstr\n" if($verbose);
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# ssh client command line options we might use and version support
|
||||
#
|
||||
|
|
@ -367,7 +356,6 @@ logmsg "ssh client found $ssh is $sshverstr\n" if($verbose);
|
|||
# -vv: increase verbosity : SunSSH 1.0.0 and later
|
||||
# -V: ssh version info : SunSSH 1.0.0 and later
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Verify minimum ssh client version
|
||||
#
|
||||
|
|
@ -377,7 +365,6 @@ if((($sshid =~ /OpenSSH/) && ($sshvernum < 299)) ||
|
|||
exit 1;
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# ssh keygen command line options we actually use and version support
|
||||
#
|
||||
|
|
@ -473,7 +460,6 @@ if((! -e pp($hstprvkeyf)) || (! -s pp($hstprvkeyf)) ||
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Convert paths for curl's tests running on Windows with Cygwin/MSYS OpenSSH
|
||||
#
|
||||
|
|
@ -587,7 +573,6 @@ else {
|
|||
# [2] Option specific for portable versions
|
||||
# [3] Option not used in our ssh server config file
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Initialize sshd config with options actually supported in OpenSSH 2.9.9
|
||||
#
|
||||
|
|
@ -662,7 +647,6 @@ if(!($sshdid =~ /OpenSSH/) || ($sshdvernum <= 730)) {
|
|||
push @cfgarr, 'X11Forwarding no';
|
||||
push @cfgarr, '#';
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Write out initial sshd configuration file for curl's tests
|
||||
#
|
||||
|
|
@ -672,7 +656,6 @@ if($error) {
|
|||
exit 1;
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Verifies at run time if sshd supports a given configuration file option
|
||||
#
|
||||
|
|
@ -702,7 +685,6 @@ sub sshd_supports_opt {
|
|||
return 0;
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Kerberos Authentication support may have not been built into sshd
|
||||
#
|
||||
|
|
@ -722,7 +704,6 @@ if(sshd_supports_opt('KerberosTicketCleanup','yes')) {
|
|||
push @cfgarr, 'KerberosTicketCleanup yes';
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Andrew File System support may have not been built into sshd
|
||||
#
|
||||
|
|
@ -730,7 +711,6 @@ if(sshd_supports_opt('AFSTokenPassing','no')) {
|
|||
push @cfgarr, 'AFSTokenPassing no';
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# S/Key authentication support may have not been built into sshd
|
||||
#
|
||||
|
|
@ -738,7 +718,6 @@ if(sshd_supports_opt('SkeyAuthentication','no')) {
|
|||
push @cfgarr, 'SkeyAuthentication no';
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# GSSAPI Authentication support may have not been built into sshd
|
||||
#
|
||||
|
|
@ -764,7 +743,6 @@ if(sshd_supports_opt('GSSUseSessionCredCache','no')) {
|
|||
}
|
||||
push @cfgarr, '#';
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Options that might be supported or not in sshd OpenSSH 2.9.9 and later
|
||||
#
|
||||
|
|
@ -824,7 +802,6 @@ if(sshd_supports_opt('X11UseLocalhost','yes')) {
|
|||
}
|
||||
push @cfgarr, '#';
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Write out resulting sshd configuration file for curl's tests
|
||||
#
|
||||
|
|
@ -834,7 +811,6 @@ if($error) {
|
|||
exit 1;
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Verify that sshd actually supports our generated configuration file
|
||||
#
|
||||
|
|
@ -845,7 +821,6 @@ if(system "\"$sshd\" -t -f $sshdconfig_abs > $sshdlog 2>&1") {
|
|||
exit 1;
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Generate ssh client host key database file for curl's tests
|
||||
#
|
||||
|
|
@ -878,7 +853,6 @@ if((! -e pp($knownhosts)) || (! -s pp($knownhosts))) {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Convert paths for curl's tests running on Windows using Cygwin OpenSSH
|
||||
#
|
||||
|
|
@ -899,7 +873,6 @@ else {
|
|||
$knownhosts_config = abs_path(pp($knownhosts));
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# ssh client configuration file options we might use and version support
|
||||
#
|
||||
|
|
@ -976,7 +949,6 @@ else {
|
|||
# [2] Option specific for portable versions
|
||||
# [3] Option not used in our ssh client config file
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Initialize ssh config with options actually supported in OpenSSH 2.9.9
|
||||
#
|
||||
|
|
@ -1032,7 +1004,6 @@ push @cfgarr, 'StrictHostKeyChecking no';
|
|||
push @cfgarr, 'UsePrivilegedPort no';
|
||||
push @cfgarr, '#';
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Options supported in ssh client newer than OpenSSH 2.9.9
|
||||
#
|
||||
|
|
@ -1132,7 +1103,6 @@ if(($sshid =~ /OpenSSH/) && ($sshvernum >= 380)) {
|
|||
|
||||
push @cfgarr, '#';
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Write out resulting ssh client configuration file for curl's tests
|
||||
#
|
||||
|
|
@ -1142,7 +1112,6 @@ if($error) {
|
|||
exit 1;
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Initialize client sftp config with options actually supported.
|
||||
#
|
||||
|
|
@ -1160,7 +1129,6 @@ for(my $i = scalar(@cfgarr) - 1; $i > 0; $i--) {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Write out resulting sftp client configuration file for curl's tests
|
||||
#
|
||||
|
|
@ -1171,7 +1139,6 @@ if($error) {
|
|||
}
|
||||
@cfgarr = ();
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Generate client sftp commands batch file for sftp server verification
|
||||
#
|
||||
|
|
@ -1232,7 +1199,6 @@ elsif($verbose && ($rc >> 8)) {
|
|||
logmsg sprintf("\"$sshd\" exited with %d\n", $rc >> 8);
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Clean up once the server has stopped
|
||||
#
|
||||
|
|
|
|||
|
|
@ -134,7 +134,6 @@ sub scanman_md_dir {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
scanallheaders();
|
||||
scanman_md_dir("$root/docs/libcurl");
|
||||
scanman_md_dir("$root/docs/libcurl/opts");
|
||||
|
|
|
|||
|
|
@ -185,7 +185,6 @@ my %opts = (
|
|||
'--wdebug' => 6,
|
||||
);
|
||||
|
||||
|
||||
#########################################################################
|
||||
# parse the curl code that parses the command line arguments!
|
||||
open($r, "<", "$root/src/tool_getparam.c") ||
|
||||
|
|
@ -257,7 +256,6 @@ while(<$r>) {
|
|||
}
|
||||
close($r);
|
||||
|
||||
|
||||
#########################################################################
|
||||
# parse the curl code that outputs the curl -h list
|
||||
open($r, "<", "$root/src/tool_listhelp.c") ||
|
||||
|
|
|
|||
|
|
@ -36,13 +36,10 @@ if(!$docsroot || ($docsroot eq "-g")) {
|
|||
exit;
|
||||
}
|
||||
|
||||
|
||||
shift @ARGV;
|
||||
|
||||
my @f = @ARGV;
|
||||
|
||||
my %manp;
|
||||
|
||||
my $errors = 0;
|
||||
|
||||
sub manpresent {
|
||||
|
|
|
|||
|
|
@ -140,7 +140,6 @@ scan_cmake_config_h();
|
|||
scan_sources();
|
||||
scan_docs();
|
||||
|
||||
|
||||
my $error = 0;
|
||||
# Check the configure symbols for use in code
|
||||
for my $s (sort keys %disable) {
|
||||
|
|
|
|||
|
|
@ -134,7 +134,6 @@ sub scanheader {
|
|||
close H;
|
||||
}
|
||||
|
||||
|
||||
opendir(my $dh, $incdir) || die "Cannot opendir $incdir: $!";
|
||||
my @hfiles = grep { /\.h$/ } readdir($dh);
|
||||
closedir $dh;
|
||||
|
|
|
|||
|
|
@ -94,7 +94,6 @@ sub allsymbols {
|
|||
close($f);
|
||||
}
|
||||
|
||||
|
||||
my %ref = (
|
||||
'curl.1' => 1
|
||||
);
|
||||
|
|
@ -266,7 +265,6 @@ sub scanmanpage {
|
|||
$errors++;
|
||||
}
|
||||
|
||||
|
||||
if($optpage && $SH && ($SH !~ /^(SYNOPSIS|EXAMPLE|NAME|SEE ALSO)/i) &&
|
||||
($_ =~ /(.*)(CURL(OPT_|MOPT_|INFO_|SHOPT_)[A-Z0-9_]*)/)) {
|
||||
# an option with its own man page, check that it is tagged
|
||||
|
|
|
|||
|
|
@ -51,7 +51,6 @@ my %hdr; # Public header files deprecations.
|
|||
my %funcman; # Function man pages deprecations.
|
||||
my %optman; # Option man pages deprecations.
|
||||
|
||||
|
||||
# Scan header file for public function and enum values. Flag them with
|
||||
# the version they are deprecated in, if some.
|
||||
sub scan_header {
|
||||
|
|
@ -238,10 +237,9 @@ sub scan_man_page {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
# Read symbols-in-versions.
|
||||
open(my $fh, "<", "$root/docs/libcurl/symbols-in-versions") ||
|
||||
die "$root/docs/libcurl/symbols-in-versions";
|
||||
die "$root/docs/libcurl/symbols-in-versions";
|
||||
while(<$fh>) {
|
||||
if($_ =~ /^((?:CURL|LIBCURL)\S+)\s+\S+\s*(\S*)\s*(\S*)$/) {
|
||||
if($3 eq "") {
|
||||
|
|
|
|||
|
|
@ -112,7 +112,6 @@ sub checkfile {
|
|||
close($fh);
|
||||
}
|
||||
|
||||
|
||||
for my $f (@m) {
|
||||
checkfile($f);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -78,7 +78,6 @@ sub scanmanpage {
|
|||
close(H);
|
||||
}
|
||||
|
||||
|
||||
opendir(my $dh, $curlh) || die "Cannot opendir $curlh: $!";
|
||||
my @hfiles = grep { /\.h$/ } readdir($dh);
|
||||
closedir $dh;
|
||||
|
|
|
|||
|
|
@ -308,7 +308,6 @@ if(!$confopts) {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
if($fixed < 4) {
|
||||
$fixed=4;
|
||||
open(my $f, ">", "$setupfile") or die;
|
||||
|
|
|
|||
|
|
@ -64,7 +64,6 @@ use globalconfig qw(
|
|||
my $logfunc; # optional reference to function for logging
|
||||
my @logmessages; # array holding logged messages
|
||||
|
||||
|
||||
#######################################################################
|
||||
# Log an informational message
|
||||
# If a log callback function was set in setlogfunc, it is called. If not,
|
||||
|
|
@ -98,7 +97,6 @@ sub clearlogs {
|
|||
return $loglines;
|
||||
}
|
||||
|
||||
|
||||
#######################################################################
|
||||
|
||||
sub includefile {
|
||||
|
|
|
|||
|
|
@ -39,8 +39,8 @@ static CURLcode test_unit1397(const char *arg)
|
|||
};
|
||||
|
||||
static const struct testcase tests[] = {
|
||||
{".hello.com", "*.hello.com", FALSE },
|
||||
{"a.hello.com", "*.hello.com", TRUE },
|
||||
{ ".hello.com", "*.hello.com", FALSE },
|
||||
{ "a.hello.com", "*.hello.com", TRUE },
|
||||
{ "", "", FALSE },
|
||||
{ "a", "", FALSE },
|
||||
{ "", "b", FALSE },
|
||||
|
|
|
|||
|
|
@ -29,10 +29,8 @@ import re
|
|||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
|
||||
REPLY_DATA = re.compile("<reply>[ \t\n\r]*<data[^<]*>(.*?)</data>", re.MULTILINE | re.DOTALL)
|
||||
|
||||
|
||||
class ClosingFileHandler(logging.StreamHandler):
|
||||
def __init__(self, filename):
|
||||
super(ClosingFileHandler, self).__init__()
|
||||
|
|
@ -82,7 +80,6 @@ class TestData(object):
|
|||
# Left-strip the data so we do not get a newline before our data.
|
||||
return m.group(1).lstrip()
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
td = TestData("./data")
|
||||
data = td.get_test_data(1451)
|
||||
|
|
|
|||
|
|
@ -35,7 +35,6 @@ BEGIN {
|
|||
);
|
||||
}
|
||||
|
||||
|
||||
use File::Basename;
|
||||
|
||||
sub valgrindparse {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue