tests: add and use `%PERL` variable to refer to the Perl binary

To ensure Perl invocations within tests call the same Perl binary used
for running the tests, as specified or auto-detected via `PERL` env
(autotools) or `PERL_EXECUTABLE` setting (cmake). Instead of the first
`perl` executable found in `PATH`.)

Cherry-picked from #14949
Closes #15097

diff --git a/tests/data/test1026 b/tests/data/test1026
index 9090bdb066b5756d9789f915e1da1a8993a55a68..3e4408244440c880e186dbca27f349b09be4820e 100644 (file)
--- a/tests/data/test1026
+++ b/tests/data/test1026
@@ -33,7 +33,7 @@ curl --manual
 # Search for these two sentinel lines in the manual output; if they are found,
 # then chances are good the entire manual is there.
 <postcheck>
-perl -e 'open(IN,$ARGV[0]); my $lines=grep(/(curl\s*-\s*transfer\sa\s*URL)|(AUTHORS)/, <IN>); exit ($lines != 2); # Let this file pass an XML syntax check: </IN>' %LOGDIR/stdout%TESTNUMBER
+%PERL -e 'open(IN,$ARGV[0]); my $lines=grep(/(curl\s*-\s*transfer\sa\s*URL)|(AUTHORS)/, <IN>); exit ($lines != 2); # Let this file pass an XML syntax check: </IN>' %LOGDIR/stdout%TESTNUMBER
 </postcheck>
 <errorcode>
 0

diff --git a/tests/data/test1027 b/tests/data/test1027
index 64d193227567a92bbe05bc495a8b63d17e8648ca..354df4e40efe30aac35218704520a40a72e0eecd 100644 (file)
--- a/tests/data/test1027
+++ b/tests/data/test1027
@@ -33,7 +33,7 @@ curl --help
 # Search for these two sentinel lines in the help output; if they are found,
 # then chances are good the entire help is there.
 <postcheck>
-perl -e 'open(IN,$ARGV[0]); my $lines=grep(/(Usage: curl )|(--version\s*Show version)/, <IN>); exit ($lines != 2); # Let this file pass an XML syntax check: </IN>' %LOGDIR/stdout%TESTNUMBER
+%PERL -e 'open(IN,$ARGV[0]); my $lines=grep(/(Usage: curl )|(--version\s*Show version)/, <IN>); exit ($lines != 2); # Let this file pass an XML syntax check: </IN>' %LOGDIR/stdout%TESTNUMBER
 </postcheck>
 </verify>
 </testcase>

diff --git a/tests/data/test1056 b/tests/data/test1056
index 033c31f9f66ddac0c9c956fdc2d2b85a79065118..7ecc349823cd8b8d9d110fd277f2b2090cd9e1e2 100644 (file)
--- a/tests/data/test1056
+++ b/tests/data/test1056
@@ -62,7 +62,7 @@ HTTP follow redirect from IPv4 to IPv6 with scope
 http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
 </command>
 <precheck>
-perl -e "print 'Test is not supported on the Windows kernel' if ($^O eq 'MSWin32' || $^O eq 'msys' || $^O eq 'cygwin');"
+%PERL -e "print 'Test is not supported on the Windows kernel' if ($^O eq 'MSWin32' || $^O eq 'msys' || $^O eq 'cygwin');"
 </precheck>
 </client>
 

diff --git a/tests/data/test1082 b/tests/data/test1082
index 606df1c86b76d5be0c700eb7992ea6740e931e47..7d26323a73fb3b1613f1d26798c64ad2dee2fde3 100644 (file)
--- a/tests/data/test1082
+++ b/tests/data/test1082
@@ -35,7 +35,7 @@ HTTP GET with localhost --interface
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -4 --interface 127.0.0.1
 </command>
 <precheck>
-perl -e "print 'Test requires default test client host address' if ( '%CLIENTIP' ne '127.0.0.1' );"
+%PERL -e "print 'Test requires default test client host address' if ( '%CLIENTIP' ne '127.0.0.1' );"
 </precheck>
 </client>
 

diff --git a/tests/data/test1083 b/tests/data/test1083
index 6757920f49b69056f1daf5d451fc22cab553ead8..b82e308fc56e745a6f24295200f47189d528eb66 100644 (file)
--- a/tests/data/test1083
+++ b/tests/data/test1083
@@ -39,7 +39,7 @@ HTTP-IPv6 GET with ip6-localhost --interface
 -g "http://%HOST6IP:%HTTP6PORT/%TESTNUMBER" --interface ip6-localhost
 </command>
 <precheck>
-perl -e "if ('%CLIENT6IP' ne '[::1]') {print 'Test requires default test client host address';} else {exec './server/resolve --ipv6 ip6-localhost'; print 'Cannot run precheck resolve';}"
+%PERL -e "if ('%CLIENT6IP' ne '[::1]') {print 'Test requires default test client host address';} else {exec './server/resolve --ipv6 ip6-localhost'; print 'Cannot run precheck resolve';}"
 </precheck>
 </client>
 

diff --git a/tests/data/test1158 b/tests/data/test1158
index 1a29bd84bd9fd2c775d422b12174eddafdb86135..f3cce4496df725f868c6c55692a27cffeebb7bf9 100644 (file)
--- a/tests/data/test1158
+++ b/tests/data/test1158
@@ -32,7 +32,7 @@ HTTP RFC1867-type formposting with filename containing '"'
 http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F "file=@\"%LOGDIR/test%TESTNUMBER\\\".txt\";type=mo/foo;filename=\"test%TESTNUMBER\\\".txt\"" -F 'file2=@"%LOGDIR/test%TESTNUMBER\".txt"' -F 'file3=@"%LOGDIR/test%TESTNUMBER\".txt";type=m/f,"%LOGDIR/test%TESTNUMBER\".txt"'
 </command>
 <precheck>
-perl -e "print 'Test requires a system supporting double quotes in file names' if ($^O eq 'msys');"
+%PERL -e "print 'Test requires a system supporting double quotes in file names' if ($^O eq 'msys');"
 </precheck>
 # We create this file before the command is invoked!
 <file name=%LOGDIR/test%TESTNUMBER".txt>

diff --git a/tests/data/test1186 b/tests/data/test1186
index 35be0e10d76ac5f1e2bfd331235cb1bd42b4a8cf..5e528dc43f28a605181004283fe21b30bba7407d 100644 (file)
--- a/tests/data/test1186
+++ b/tests/data/test1186
@@ -32,7 +32,7 @@ Multipart formposting with backslash-escaping filename containing '"'
 http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --form-escape -F "file=@\"%LOGDIR/test%TESTNUMBER\\\".txt\";type=mo/foo;filename=\"test%TESTNUMBER\\\".txt\"" -F 'file2=@"%LOGDIR/test%TESTNUMBER\".txt"' -F 'file3=@"%LOGDIR/test%TESTNUMBER\".txt";type=m/f,"%LOGDIR/test%TESTNUMBER\".txt"'
 </command>
 <precheck>
-perl -e "print 'Test requires a system supporting double quotes in file names' if ($^O eq 'msys');"
+%PERL -e "print 'Test requires a system supporting double quotes in file names' if ($^O eq 'msys');"
 </precheck>
 # We create this file before the command is invoked!
 <file name=%LOGDIR/test%TESTNUMBER".txt>

diff --git a/tests/data/test1291 b/tests/data/test1291
index ea9a0c6ab4060ef7712dbbeafcbf763261a4e8a1..30ea21ac85ed568eecb2892b13b845b50cbe2fd9 100644 (file)
--- a/tests/data/test1291
+++ b/tests/data/test1291
@@ -31,7 +31,7 @@ XXXXXXXx
 </file>
 # generate the config file
 <precheck>
-perl -e 'for(1 .. 1000) { printf("upload-file=%LOGDIR/upload-this\nurl=htttttp://non-existing-host.haxx.se/upload/%TESTNUMBER\n", $_);}' > %LOGDIR/cmd%TESTNUMBER;
+%PERL -e 'for(1 .. 1000) { printf("upload-file=%LOGDIR/upload-this\nurl=htttttp://non-existing-host.haxx.se/upload/%TESTNUMBER\n", $_);}' > %LOGDIR/cmd%TESTNUMBER;
 </precheck>
 </client>
 

diff --git a/tests/data/test1443 b/tests/data/test1443
index f3919d1d8887a817c2de97672842a07badd284d1..a1e52beffeb1a0d05c95b6e6c609f4c4bb7784a9 100644 (file)
--- a/tests/data/test1443
+++ b/tests/data/test1443
@@ -60,7 +60,7 @@ Accept: */*
 12345
 </file>
 <postcheck>
-perl -e 'exit((stat("%LOGDIR/%TESTNUMBER"))[9] != 960898200)'
+%PERL -e 'exit((stat("%LOGDIR/%TESTNUMBER"))[9] != 960898200)'
 </postcheck>
 </verify>
 </testcase>

diff --git a/tests/data/test1444 b/tests/data/test1444
index 7d80fa9263da610f7cbe8c13618fa1e9ecb887af..ad1dc4634a2b8c49fb6ca1f4fee91b8ae195b360 100644 (file)
--- a/tests/data/test1444
+++ b/tests/data/test1444
@@ -49,7 +49,7 @@ QUIT
 # Verify the mtime of the file. The mtime is specifically chosen to be an even
 # number so that it can be represented exactly on a FAT filesystem.
 <postcheck>
-perl -e 'exit((stat("%LOGDIR/curl%TESTNUMBER.out"))[9] != 1234567890)'
+%PERL -e 'exit((stat("%LOGDIR/curl%TESTNUMBER.out"))[9] != 1234567890)'
 </postcheck>
 </verify>
 </testcase>

diff --git a/tests/data/test1445 b/tests/data/test1445
index abdf58852208d186f011a13fa2ac0f94d707ced8..f52be8f7254a105adbe86b52074c3f3afe95bc9b 100644 (file)
--- a/tests/data/test1445
+++ b/tests/data/test1445
@@ -15,7 +15,7 @@ FILE
 file
 </server>
 <precheck>
-perl %SRCDIR/libtest/test613.pl prepare %PWD/%LOGDIR/test%TESTNUMBER.dir
+%PERL %SRCDIR/libtest/test613.pl prepare %PWD/%LOGDIR/test%TESTNUMBER.dir
 </precheck>
 <name>
 file:// with --remote-time
@@ -28,8 +28,8 @@ file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.dir/plainfile.txt --remote-tim
 # Verify data after the test has been "shot"
 <verify>
 <postcheck>
-perl %SRCDIR/libtest/test613.pl postprocess %PWD/%LOGDIR/test%TESTNUMBER.dir && \
-perl -e 'exit((stat("%LOGDIR/curl%TESTNUMBER.out"))[9] != 946728000)'
+%PERL %SRCDIR/libtest/test613.pl postprocess %PWD/%LOGDIR/test%TESTNUMBER.dir && \
+%PERL -e 'exit((stat("%LOGDIR/curl%TESTNUMBER.out"))[9] != 946728000)'
 </postcheck>
 </verify>
 </testcase>

diff --git a/tests/data/test1446 b/tests/data/test1446
index 8cab8d5483d16a7a8f9187737b69053c4e383698..bec6dd7f3a6b2b8970061caa685e8f2df52776bd 100644 (file)
--- a/tests/data/test1446
+++ b/tests/data/test1446
@@ -18,7 +18,7 @@ SFTP
 sftp
 </server>
 <precheck>
-perl %SRCDIR/libtest/test613.pl prepare %PWD/%LOGDIR/test%TESTNUMBER.dir
+%PERL %SRCDIR/libtest/test613.pl prepare %PWD/%LOGDIR/test%TESTNUMBER.dir
 </precheck>
 <name>
 SFTP with --remote-time
@@ -32,8 +32,8 @@ SFTP with --remote-time
 # Verify data after the test has been "shot"
 <verify>
 <postcheck>
-perl %SRCDIR/libtest/test613.pl postprocess %PWD/%LOGDIR/test%TESTNUMBER.dir && \
-perl -e 'exit((stat("%LOGDIR/curl%TESTNUMBER.out"))[9] != 978264000)'
+%PERL %SRCDIR/libtest/test613.pl postprocess %PWD/%LOGDIR/test%TESTNUMBER.dir && \
+%PERL -e 'exit((stat("%LOGDIR/curl%TESTNUMBER.out"))[9] != 978264000)'
 </postcheck>
 </verify>
 </testcase>

diff --git a/tests/data/test1683 b/tests/data/test1683
index cf55568d37a4405c28513becb4a194daf20190fe..66f41cea55c94b139f79b2f08c55895d063d5fd0 100644 (file)
--- a/tests/data/test1683
+++ b/tests/data/test1683
@@ -39,7 +39,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/exist%TESTNUMBER --no-clobber
 to stay the same
 </file>
 <precheck>
-perl -e 'for my $i ((1..100)) { my $filename = "%LOGDIR/exist%TESTNUMBER.$i"; open(FH, ">", $filename) or die $!; print FH "to stay the same" ; close(FH) }'
+%PERL -e 'for my $i ((1..100)) { my $filename = "%LOGDIR/exist%TESTNUMBER.$i"; open(FH, ">", $filename) or die $!; print FH "to stay the same" ; close(FH) }'
 </precheck>
 </client>
 
@@ -53,7 +53,7 @@ perl -e 'for my $i ((1..100)) { my $filename = "%LOGDIR/exist%TESTNUMBER.$i"; op
 to stay the same
 </file>
 <postcheck>
-perl -e 'for my $i ((1..100)) { my $filename = "%LOGDIR/exist%TESTNUMBER.$i"; open(FH, "<", $filename) or die $!; (<FH> eq "to stay the same" and <FH> eq "") or die "incorrect $filename" ; close(FH) }'
+%PERL -e 'for my $i ((1..100)) { my $filename = "%LOGDIR/exist%TESTNUMBER.$i"; open(FH, "<", $filename) or die $!; (<FH> eq "to stay the same" and <FH> eq "") or die "incorrect $filename" ; close(FH) }'
 </postcheck>
 </verify>
 </testcase>

diff --git a/tests/data/test2072 b/tests/data/test2072
index 7f72b6955ff347be496581aaa9fac47b3832ba9a..c1a252094a0dcca162fcd31f8d86247bd8b2a55e 100644 (file)
--- a/tests/data/test2072
+++ b/tests/data/test2072
@@ -27,7 +27,7 @@ file:// with Unix path resolution behavior for the case of extra slashes
 file:////%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt
 </command>
 <precheck>
-perl -e "print 'Test requires a Unix system' if ( $^O eq 'MSWin32' || $^O eq 'cygwin' || $^O eq 'dos' || $^O eq 'msys');"
+%PERL -e "print 'Test requires a Unix system' if ( $^O eq 'MSWin32' || $^O eq 'cygwin' || $^O eq 'dos' || $^O eq 'msys');"
 </precheck>
 <file name="%LOGDIR/test%TESTNUMBER.txt">
 foo

diff --git a/tests/data/test307 b/tests/data/test307
index ce3232ac7fe55fe57939a88af8164e0579b88ae2..475fdaee3112cf8e71a3509f7a6e3812d70e2a1f 100644 (file)
--- a/tests/data/test307
+++ b/tests/data/test307
@@ -29,7 +29,7 @@ OpenSSL
 https
 </server>
 <precheck>
-perl %SRCDIR/libtest/test%TESTNUMBER.pl %CURL
+%PERL %SRCDIR/libtest/test%TESTNUMBER.pl %CURL
 </precheck>
 
 <name>

diff --git a/tests/data/test608 b/tests/data/test608
index 233b3d0c2c5592c7098ff127b6224e2ce4df6a9f..f618f3937d5e4cc2afb1949d29be56171958acc2 100644 (file)
--- a/tests/data/test608
+++ b/tests/data/test608
@@ -40,7 +40,7 @@ Test file for rename test
 Test file for rename test
 </file>
 <postcheck>
-perl %SRCDIR/libtest/test610.pl gone %PWD/%LOGDIR/file%TESTNUMBER.txt move %PWD/%LOGDIR/file%TESTNUMBER-renamed.txt %PWD/%LOGDIR/file%TESTNUMBER.txt
+%PERL %SRCDIR/libtest/test610.pl gone %PWD/%LOGDIR/file%TESTNUMBER.txt move %PWD/%LOGDIR/file%TESTNUMBER-renamed.txt %PWD/%LOGDIR/file%TESTNUMBER.txt
 </postcheck>
 </verify>
 </testcase>

diff --git a/tests/data/test610 b/tests/data/test610
index a41201a8b79b4159abf13e6e835db8040c51a039..ca7dbdad82df38cc600a6d3eefce63178e8457eb 100644 (file)
--- a/tests/data/test610
+++ b/tests/data/test610
@@ -21,7 +21,7 @@ Dummy test file for rmdir test
 sftp
 </server>
 <precheck>
-perl %SRCDIR/libtest/test%TESTNUMBER.pl mkdir %PWD/%LOGDIR/test%TESTNUMBER.dir
+%PERL %SRCDIR/libtest/test%TESTNUMBER.pl mkdir %PWD/%LOGDIR/test%TESTNUMBER.dir
 </precheck>
 <name>
 SFTP post-quote rmdir
@@ -38,7 +38,7 @@ Dummy test file for rmdir test
 # Verify data after the test has been "shot"
 <verify>
 <postcheck>
-perl %SRCDIR/libtest/test%TESTNUMBER.pl gone %PWD/%LOGDIR/test%TESTNUMBER.dir
+%PERL %SRCDIR/libtest/test%TESTNUMBER.pl gone %PWD/%LOGDIR/test%TESTNUMBER.dir
 </postcheck>
 </verify>
 </testcase>

diff --git a/tests/data/test611 b/tests/data/test611
index 8c11bce76a23b7bd52c5de80bb8850888aa433ac..b1545630368b250284798b6b0b7ad90859efb3ad 100644 (file)
--- a/tests/data/test611
+++ b/tests/data/test611
@@ -21,7 +21,7 @@ Dummy test file for rename test
 sftp
 </server>
 <precheck>
-perl %SRCDIR/libtest/test610.pl mkdir %PWD/%LOGDIR/test%TESTNUMBER.dir
+%PERL %SRCDIR/libtest/test610.pl mkdir %PWD/%LOGDIR/test%TESTNUMBER.dir
 </precheck>
 <name>
 SFTP post-quote rename
@@ -38,7 +38,7 @@ Dummy test file for rename test
 # Verify data after the test has been "shot"
 <verify>
 <postcheck>
-perl %SRCDIR/libtest/test610.pl rmdir %PWD/%LOGDIR/test%TESTNUMBER.new
+%PERL %SRCDIR/libtest/test610.pl rmdir %PWD/%LOGDIR/test%TESTNUMBER.new
 </postcheck>
 </verify>
 </testcase>

diff --git a/tests/data/test612 b/tests/data/test612
index 977f470301ec78e5140604d5606262a9c23558a4..b8bb6ce1646ee2ba06f36fb4f5aadde14cee5297 100644 (file)
--- a/tests/data/test612
+++ b/tests/data/test612
@@ -38,7 +38,7 @@ Dummy test file for remove test
 Dummy test file for remove test
 </upload>
 <postcheck>
-perl %SRCDIR/libtest/test610.pl gone %PWD/%LOGDIR/test%TESTNUMBER.txt
+%PERL %SRCDIR/libtest/test610.pl gone %PWD/%LOGDIR/test%TESTNUMBER.txt
 </postcheck>
 </verify>
 </testcase>

diff --git a/tests/data/test613 b/tests/data/test613
index 67724590464effe297f0371c924e7d3420a7907f..42cb1ee41357791b4b3f4702ad7a16015c07dd3f 100644 (file)
--- a/tests/data/test613
+++ b/tests/data/test613
@@ -23,7 +23,7 @@ d?????????    N U         U               N ???  N NN:NN asubdir
 sftp
 </server>
 <precheck>
-perl %SRCDIR/libtest/test%TESTNUMBER.pl prepare %PWD/%LOGDIR/test%TESTNUMBER.dir
+%PERL %SRCDIR/libtest/test%TESTNUMBER.pl prepare %PWD/%LOGDIR/test%TESTNUMBER.dir
 </precheck>
 <name>
 SFTP directory retrieval
@@ -37,7 +37,7 @@ SFTP directory retrieval
 # Verify data after the test has been "shot"
 <verify>
 <postcheck>
-perl %SRCDIR/libtest/test%TESTNUMBER.pl postprocess %PWD/%LOGDIR/test%TESTNUMBER.dir %PWD/%LOGDIR/curl%TESTNUMBER.out
+%PERL %SRCDIR/libtest/test%TESTNUMBER.pl postprocess %PWD/%LOGDIR/test%TESTNUMBER.dir %PWD/%LOGDIR/curl%TESTNUMBER.out
 </postcheck>
 </verify>
 </testcase>

diff --git a/tests/data/test614 b/tests/data/test614
index a5df69f05195ec6686b1ae6f1b4693638f3a3a3b..df729006035dc7b5e272d48313d45cfb0a9284f7 100644 (file)
--- a/tests/data/test614
+++ b/tests/data/test614
@@ -24,7 +24,7 @@ d?????????    N U         U               N ???  N NN:NN asubdir
 sftp
 </server>
 <precheck>
-perl %SRCDIR/libtest/test613.pl prepare %PWD/%LOGDIR/test%TESTNUMBER.dir
+%PERL %SRCDIR/libtest/test613.pl prepare %PWD/%LOGDIR/test%TESTNUMBER.dir
 </precheck>
 <name>
 SFTP pre-quote chmod
@@ -38,7 +38,7 @@ SFTP pre-quote chmod
 # Verify data after the test has been "shot"
 <verify>
 <postcheck>
-perl %SRCDIR/libtest/test613.pl postprocess %PWD/%LOGDIR/test%TESTNUMBER.dir %PWD/%LOGDIR/curl%TESTNUMBER.out
+%PERL %SRCDIR/libtest/test613.pl postprocess %PWD/%LOGDIR/test%TESTNUMBER.dir %PWD/%LOGDIR/curl%TESTNUMBER.out
 </postcheck>
 </verify>
 </testcase>

diff --git a/tests/data/test615 b/tests/data/test615
index 766ac330cdcd9b68e3712c1a82d705f5455d8db5..dabca40b4a9ad6af5a5dfab6613ad61a09e24a7f 100644 (file)
--- a/tests/data/test615
+++ b/tests/data/test615
@@ -14,7 +14,7 @@ FAILURE
 sftp
 </server>
 <precheck>
-perl %SRCDIR/libtest/test613.pl prepare %PWD/%LOGDIR/test%TESTNUMBER.dir
+%PERL %SRCDIR/libtest/test613.pl prepare %PWD/%LOGDIR/test%TESTNUMBER.dir
 </precheck>
 <name>
 SFTP put remote failure
@@ -35,7 +35,7 @@ for ssh upload test
 9
 </errorcode>
 <postcheck>
-perl %SRCDIR/libtest/test613.pl postprocess %PWD/%LOGDIR/test%TESTNUMBER.dir
+%PERL %SRCDIR/libtest/test613.pl postprocess %PWD/%LOGDIR/test%TESTNUMBER.dir
 </postcheck>
 </verify>
 </testcase>

diff --git a/tests/data/test624 b/tests/data/test624
index b20b2140807dcda9938bf959085abe76ba23807a..4305f481a04adfccc810092488f22cd3a696853c 100644 (file)
--- a/tests/data/test624
+++ b/tests/data/test624
@@ -38,7 +38,7 @@ Test data
 for ssh upload test
 </upload>
 <postcheck>
-perl %SRCDIR/libtest/test610.pl move %PWD/%LOGDIR/test%TESTNUMBER.dir/upload.%TESTNUMBER %PWD/%LOGDIR/upload.%TESTNUMBER rmdir %PWD/%LOGDIR/test%TESTNUMBER.dir
+%PERL %SRCDIR/libtest/test610.pl move %PWD/%LOGDIR/test%TESTNUMBER.dir/upload.%TESTNUMBER %PWD/%LOGDIR/upload.%TESTNUMBER rmdir %PWD/%LOGDIR/test%TESTNUMBER.dir
 </postcheck>
 </verify>
 </testcase>

diff --git a/tests/data/test625 b/tests/data/test625
index bf949329fdcd20529032a851ddea62ae037134f2..29a9a1cbf2780fcd792f7bb3cb21bc530814cb80 100644 (file)
--- a/tests/data/test625
+++ b/tests/data/test625
@@ -38,7 +38,7 @@ Test data
 for ssh upload test
 </upload>
 <postcheck>
-perl %SRCDIR/libtest/test610.pl move %PWD/%LOGDIR/test%TESTNUMBER.a/upload.%TESTNUMBER %PWD/%LOGDIR/upload.%TESTNUMBER rmdir %PWD/%LOGDIR/test%TESTNUMBER.a rm %PWD/%LOGDIR/test%TESTNUMBER.b/upload.%TESTNUMBER rmdir %PWD/%LOGDIR/test%TESTNUMBER.b
+%PERL %SRCDIR/libtest/test610.pl move %PWD/%LOGDIR/test%TESTNUMBER.a/upload.%TESTNUMBER %PWD/%LOGDIR/upload.%TESTNUMBER rmdir %PWD/%LOGDIR/test%TESTNUMBER.a rm %PWD/%LOGDIR/test%TESTNUMBER.b/upload.%TESTNUMBER rmdir %PWD/%LOGDIR/test%TESTNUMBER.b
 </postcheck>
 </verify>
 </testcase>

diff --git a/tests/data/test627 b/tests/data/test627
index 764ac8515fbdee8cda320f7c1082b3bdb471efbd..a19acf683d851b494276861c6ad746a11ddaad10 100644 (file)
--- a/tests/data/test627
+++ b/tests/data/test627
@@ -37,7 +37,7 @@ Dummy test file for remove test
 <protocol>
 </protocol>
 <postcheck>
-perl %SRCDIR/libtest/test610.pl gone %PWD/%LOGDIR/test%TESTNUMBER.txt
+%PERL %SRCDIR/libtest/test610.pl gone %PWD/%LOGDIR/test%TESTNUMBER.txt
 </postcheck>
 </verify>
 </testcase>

diff --git a/tests/data/test638 b/tests/data/test638
index a1c77927af36bc85acc50ff99f4804c94cebe7f7..2f6d69eb3872a5e3896148d133501a7299186258 100644 (file)
--- a/tests/data/test638
+++ b/tests/data/test638
@@ -23,7 +23,7 @@ Dummy test file for rename test
 sftp
 </server>
 <precheck>
-perl %SRCDIR/libtest/test610.pl mkdir %PWD/%LOGDIR/test%TESTNUMBER.dir
+%PERL %SRCDIR/libtest/test610.pl mkdir %PWD/%LOGDIR/test%TESTNUMBER.dir
 </precheck>
 <name>
 SFTP post-quote rename * asterisk accept-fail
@@ -40,7 +40,7 @@ Dummy test file for rename test
 # Verify data after the test has been "shot"
 <verify>
 <postcheck>
-perl %SRCDIR/libtest/test610.pl rmdir %PWD/%LOGDIR/test%TESTNUMBER.new
+%PERL %SRCDIR/libtest/test610.pl rmdir %PWD/%LOGDIR/test%TESTNUMBER.new
 </postcheck>
 </verify>
 </testcase>

diff --git a/tests/data/test639 b/tests/data/test639
index 46aed8df4b9f631431457c3fb0628e2d73c2344e..44d070d281c6aa221d303183f1f80aea0a7bc914 100644 (file)
--- a/tests/data/test639
+++ b/tests/data/test639
@@ -23,7 +23,7 @@ Dummy test file for rename test
 sftp
 </server>
 <precheck>
-perl %SRCDIR/libtest/test610.pl mkdir %PWD/%LOGDIR/test%TESTNUMBER.dir
+%PERL %SRCDIR/libtest/test610.pl mkdir %PWD/%LOGDIR/test%TESTNUMBER.dir
 </precheck>
 <name>
 SFTP post-quote rename * asterisk accept-fail
@@ -40,7 +40,7 @@ Dummy test file for rename test
 # Verify data after the test has been "shot"
 <verify>
 <postcheck>
-perl %SRCDIR/libtest/test610.pl rmdir %PWD/%LOGDIR/test%TESTNUMBER.dir
+%PERL %SRCDIR/libtest/test610.pl rmdir %PWD/%LOGDIR/test%TESTNUMBER.dir
 </postcheck>
 </verify>
 </testcase>

diff --git a/tests/data/test8 b/tests/data/test8
index 9e58188151a1c97b02ef59a646047650617a0ff4..e231cd7eb79a71b4a63f6f0df258f57224846d27 100644 (file)
--- a/tests/data/test8
+++ b/tests/data/test8
@@ -79,7 +79,7 @@ Set-Cookie: cookie31=%hex[%7f-junk]hex%
 
 </file>
 <precheck>
-perl -e 'if ("%HOSTIP" !~ /\.0\.0\.1$/) {print "Test only works for HOSTIPs ending with .0.0.1"; exit(1)}'
+%PERL -e 'if ("%HOSTIP" !~ /\.0\.0\.1$/) {print "Test only works for HOSTIPs ending with .0.0.1"; exit(1)}'
 </precheck>
 <features>
 cookies

diff --git a/tests/globalconfig.pm b/tests/globalconfig.pm
index e1f17df436cb4ca573f6fcf654b9db7bed6d5e2b..d9d18e93130f1d9981aec4c8c0f1b081d10f4dad 100644 (file)
--- a/tests/globalconfig.pm
+++ b/tests/globalconfig.pm
@@ -47,6 +47,7 @@ BEGIN {
         $LOGDIR
         $memanalyze
         $MEMDUMP
+        $perlcmd
         $perl
         $PIDDIR
         $proxy_address
@@ -91,7 +92,8 @@ our $randseed = 0;    # random number seed
 # paths
 our $pwd = getcwd();  # current working directory
 our $srcdir = $ENV{'srcdir'} || '.';  # root of the test source code
-our $perl="perl -I. -I$srcdir"; # invoke perl like this
+our $perlcmd="$^X";
+our $perl="$perlcmd -I. -I$srcdir"; # invoke perl like this
 our $LOGDIR="log";  # root of the log directory; this will be different for
                     # each runner in multiprocess mode
 our $LIBDIR="./libtest";

diff --git a/tests/servers.pm b/tests/servers.pm
index 0be4366a1ec5abf3132d511ac817343c676cdd54..c73a21b093722fd462dd4de8002c0cb97d4f2012 100644 (file)
--- a/tests/servers.pm
+++ b/tests/servers.pm
@@ -3095,6 +3095,7 @@ sub subvariables {
     $$thing =~ s/${prefix}HOSTIP/$HOSTIP/g;
 
     # misc
+    $$thing =~ s/${prefix}PERL/$perlcmd/g;
     $$thing =~ s/${prefix}CURL/$CURL/g;
     $$thing =~ s/${prefix}LOGDIR/$LOGDIR/g;
     $$thing =~ s/${prefix}PWD/$pwd/g;