moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

ftpserver: only load the preprocessed test file 

We always preprocess and tests are no longer sensible to load "raw"

Closes #6738
This commit is contained in:
Daniel Stenberg 2021-03-18 09:08:55 +01:00
parent e2b4df7b5e
commit bd738bef12
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/ftpserver.pl
View File

@ -6,7 +6,7 @@
# | (__| |_| | _ <| |___ # | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____| # \___|\___/|_| \_\_____|
# #
# Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. # Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
# #
# This software is licensed as described in the file COPYING, which # This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms # you should have received as part of this distribution. The terms
@ -2092,8 +2092,7 @@ my @ftpdir=("total 20\r\n",
logmsg "pass LIST data on data connection\n"; logmsg "pass LIST data on data connection\n";
if($cwd_testno) { if($cwd_testno) {
loadtest("$logdir/test$cwd_testno") || loadtest("$logdir/test$cwd_testno");
loadtest("$srcdir/data/test$cwd_testno");
my @data = getpart("reply", "data"); my @data = getpart("reply", "data");
for(@data) { for(@data) {
@ -2156,8 +2155,7 @@ sub MDTM_ftp {
$testno = int($testno / 10000); $testno = int($testno / 10000);
} }
loadtest("$logdir/test$testno") || loadtest("$logdir/test$testno");
loadtest("$srcdir/data/test$testno");
my @data = getpart("reply", "mdtm"); my @data = getpart("reply", "mdtm");
@ -2210,9 +2208,7 @@ sub SIZE_ftp {
$testno = int($testno / 10000); $testno = int($testno / 10000);
} }
loadtest("$logdir/test$testno") || loadtest("$logdir/test$testno");
loadtest("$srcdir/data/test$testno");
my @data = getpart("reply", "size"); my @data = getpart("reply", "size");
my $size = $data[0]; my $size = $data[0];
@ -2300,8 +2296,7 @@ sub RETR_ftp {
$testno = int($testno / 10000); $testno = int($testno / 10000);
} }
loadtest("$logdir/test$testno") || loadtest("$logdir/test$testno");
loadtest("$srcdir/data/test$testno");
my @data = getpart("reply", "data$testpart"); my @data = getpart("reply", "data$testpart");
@ -3090,8 +3085,7 @@ while(1) {
$| = 1; $| = 1;
&customize(); # read test control instructions &customize(); # read test control instructions
loadtest("$logdir/test$testno") || loadtest("$logdir/test$testno");
loadtest("$srcdir/data/test$testno");
my $welcome = $commandreply{"welcome"}; my $welcome = $commandreply{"welcome"};
if(!$welcome) { if(!$welcome) {