mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-01-30 14:22:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

tests: HTTP server fixups

Browse Source 
- httpserver.pl -> http-server.pl for consistency
- add http3-server.pl to EXTRA_DIST; alphabetise for maintainability
- nghttpx proxy invocation scripts should not use getcwd

Closes #10568
This commit is contained in:
Matt Jolly 2023-02-20 19:29:03 +11:00 committed by Daniel Stenberg
parent 046209e561
commit cbf5717615
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
5 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tests/Makefile.am
View File

@ -26,15 +26,14 @@ HTMLPAGES = testcurl.html runtests.html
PDFPAGES = testcurl.pdf runtests.pdf
MANDISTPAGES = runtests.1.dist testcurl.1.dist
EXTRA_DIST = ftpserver.pl httpserver.pl secureserver.pl runtests.pl \
getpart.pm FILEFORMAT.md README.md stunnel.pem memanalyze.pl testcurl.pl \
valgrind.pm ftp.pm sshserver.pl sshhelp.pm pathhelp.pm testcurl.1 runtests.1 \
serverhelp.pm tftpserver.pl rtspserver.pl directories.pm symbol-scan.pl \
CMakeLists.txt mem-include-scan.pl valgrind.supp extern-scan.pl \
manpage-scan.pl nroff-scan.pl http2-server.pl dictserver.py \
negtelnetserver.py smbserver.py util.py disable-scan.pl manpage-syntax.pl \
error-codes.pl badsymbols.pl azure.pm appveyor.pm version-scan.pl \
options-scan.pl markdown-uppercase.pl check-deprecated.pl option-check.pl
EXTRA_DIST = appveyor.pm azure.pm badsymbols.pl check-deprecated.pl CMakeLists.txt \
dictserver.py directories.pm disable-scan.pl error-codes.pl extern-scan.pl \
FILEFORMAT.md ftp.pm ftpserver.pl getpart.pm http-server.pl http2-server.pl http3-server.pl \
manpage-scan.pl manpage-syntax.pl markdown-uppercase.pl mem-include-scan.pl \
memanalyze.pl negtelnetserver.py nroff-scan.pl option-check.pl options-scan.pl \
pathhelp.pm README.md rtspserver.pl runtests.1 runtests.pl secureserver.pl \
serverhelp.pm smbserver.py sshhelp.pm sshserver.pl stunnel.pem symbol-scan.pl \
testcurl.1 testcurl.pl tftpserver.pl util.py valgrind.pm valgrind.supp version-scan.pl
DISTCLEANFILES = configurehelp.pm

0
tests/httpserver.pl → tests/http-server.pl
View File

4
tests/http2-server.pl
View File

@ -27,6 +27,7 @@
# nghttpx runs as a proxy in front of our "actual" HTTP/1 server.
use Cwd;
use Cwd 'abs_path';
use File::Basename;
my $pidfile = "log/nghttpx.pid";
my $logfile = "log/http2.log";
@ -93,8 +94,7 @@ while(@ARGV) {
shift @ARGV;
}
my $path = getcwd();
my $srcdir = $path;
my $srcdir = dirname(__FILE__);
$certfile = "$srcdir/certs/$cert.pem";
$keyfile = "$srcdir/certs/$cert.key";
$certfile = abs_path($certfile);

4
tests/http3-server.pl
View File

@ -28,6 +28,7 @@
use Cwd;
use Cwd 'abs_path';
use File::Basename;
my $pidfile = "log/nghttpx.pid";
my $logfile = "log/http3.log";
@ -93,8 +94,7 @@ while(@ARGV) {
shift @ARGV;
}
my $path = getcwd();
my $srcdir = $path;
my $srcdir = dirname(__FILE__);
$certfile = "$srcdir/certs/$cert.pem";
$keyfile = "$srcdir/certs/$cert.key";
$certfile = abs_path($certfile);

2
tests/runtests.pl
View File

@ -1677,7 +1677,7 @@ sub runhttpserver {
my $pidfile;
my $logfile;
my $flags = "";
my $exe = "$perl $srcdir/httpserver.pl";
my $exe = "$perl $srcdir/http-server.pl";
my $verbose_flag = "--verbose ";
if($alt eq "ipv6") {