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

runtests: accept CURL_DIRSUFFIX without ending slash

Browse Source 
Follow-up to 3585796049 #16452
Closes #16506
This commit is contained in:
Viktor Szakats 2025-02-27 02:38:07 +01:00
parent 59f4727480
commit cba83bfb10
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
4 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/windows.yml vendored
View File

@ -907,7 +907,7 @@ jobs:
if: ${{ matrix.tflags != 'skipall' && matrix.tflags != 'skiprun' }} if: ${{ matrix.tflags != 'skipall' && matrix.tflags != 'skiprun' }}
timeout-minutes: 10 timeout-minutes: 10
run: | run: |
export CURL_DIRSUFFIX='${{ matrix.type }}/' export CURL_DIRSUFFIX='${{ matrix.type }}'
export TFLAGS='-j8 ~WebSockets ~SCP ~612 ${{ matrix.tflags }}' export TFLAGS='-j8 ~WebSockets ~SCP ~612 ${{ matrix.tflags }}'
if [[ '${{ matrix.install }}' = *'libssh2[core,zlib]'* ]]; then if [[ '${{ matrix.install }}' = *'libssh2[core,zlib]'* ]]; then
TFLAGS+=' ~SFTP' TFLAGS+=' ~SFTP'

2
appveyor.sh
View File

@ -147,7 +147,7 @@ fi
if [ "${TFLAGS}" != 'skipall' ] && \ if [ "${TFLAGS}" != 'skipall' ] && \
[ "${TFLAGS}" != 'skiprun' ]; then [ "${TFLAGS}" != 'skiprun' ]; then
export CURL_DIRSUFFIX="${PRJ_CFG}/" export CURL_DIRSUFFIX="${PRJ_CFG}"
if [ -x "$(cygpath "${SYSTEMROOT}/System32/curl.exe")" ]; then if [ -x "$(cygpath "${SYSTEMROOT}/System32/curl.exe")" ]; then
TFLAGS+=" -ac $(cygpath "${SYSTEMROOT}/System32/curl.exe")" TFLAGS+=" -ac $(cygpath "${SYSTEMROOT}/System32/curl.exe")"
elif [ -x "$(cygpath 'C:/msys64/usr/bin/curl.exe')" ]; then elif [ -x "$(cygpath 'C:/msys64/usr/bin/curl.exe')" ]; then

13
tests/globalconfig.pm
View File

@ -73,7 +73,10 @@ BEGIN {
$dev_null $dev_null
); );
} }
use pathhelp qw(exe_ext); use pathhelp qw(
exe_ext
dirsepadd
);
use Cwd qw(getcwd); use Cwd qw(getcwd);
use testutil qw( use testutil qw(
shell_quote shell_quote
@ -104,11 +107,11 @@ our $perlcmd=shell_quote($^X);
our $perl="$perlcmd -I. " . shell_quote("-I$srcdir"); # invoke perl like this our $perl="$perlcmd -I. " . shell_quote("-I$srcdir"); # invoke perl like this
our $LOGDIR="log"; # root of the log directory; this will be different for our $LOGDIR="log"; # root of the log directory; this will be different for
# each runner in multiprocess mode # each runner in multiprocess mode
our $LIBDIR="./libtest/" . ($ENV{'CURL_DIRSUFFIX'} || ''); our $LIBDIR=dirsepadd("./libtest/" . ($ENV{'CURL_DIRSUFFIX'} || ''));
our $UNITDIR="./unit/" . ($ENV{'CURL_DIRSUFFIX'} || ''); our $UNITDIR=dirsepadd("./unit/" . ($ENV{'CURL_DIRSUFFIX'} || ''));
our $SRVDIR="./server/" . ($ENV{'CURL_DIRSUFFIX'} || ''); our $SRVDIR=dirsepadd("./server/" . ($ENV{'CURL_DIRSUFFIX'} || ''));
our $TESTDIR="$srcdir/data"; our $TESTDIR="$srcdir/data";
our $CURL="../src/" . ($ENV{'CURL_DIRSUFFIX'} || '') . "curl".exe_ext('TOOL'); # what curl binary to run on the tests our $CURL=dirsepadd("../src/" . ($ENV{'CURL_DIRSUFFIX'} || '')) . "curl".exe_ext('TOOL'); # what curl binary to run on the tests
our $VCURL=$CURL; # what curl binary to use to verify the servers with our $VCURL=$CURL; # what curl binary to use to verify the servers with
# VCURL is handy to set to the system one when the one you # VCURL is handy to set to the system one when the one you
# just built hangs or crashes and thus prevent verification # just built hangs or crashes and thus prevent verification

10
tests/pathhelp.pm
View File

@ -59,6 +59,7 @@ BEGIN {
our @EXPORT_OK = qw( our @EXPORT_OK = qw(
os_is_win os_is_win
exe_ext exe_ext
dirsepadd
sys_native_abs_path sys_native_abs_path
sys_native_current_path sys_native_current_path
build_sys_abs_path build_sys_abs_path
@ -182,4 +183,13 @@ sub exe_ext {
return ''; return '';
} }
#***************************************************************************
# Add ending slash if missing
#
sub dirsepadd {
my ($dir) = @_;
$dir =~ s/\/$//;
return $dir . '/';
}
1; # End of module 1; # End of module