aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2010-02-16 13:32:45 +0000
committerYang Tse <yangsita@gmail.com>2010-02-16 13:32:45 +0000
commit46b112bcd439f4413925a7300d66a3e6f148765e (patch)
treec925ce0c32a0af8bbcf427187c3838d005e3218b /tests
parentf442dd6496c8710c4000a078e8085238fdaa7545 (diff)
replaced tabs with spaces
Diffstat (limited to 'tests')
-rw-r--r--tests/getpart.pm2
-rwxr-xr-xtests/libtest/test1013.pl10
-rwxr-xr-xtests/libtest/test1022.pl26
-rwxr-xr-xtests/libtest/test307.pl8
-rwxr-xr-xtests/libtest/test610.pl46
-rwxr-xr-xtests/libtest/test613.pl148
-rwxr-xr-xtests/libtest/test75.pl8
-rwxr-xr-xtests/memanalyze.pl2
-rwxr-xr-xtests/runtests.pl2
9 files changed, 126 insertions, 126 deletions
diff --git a/tests/getpart.pm b/tests/getpart.pm
index 7f426179b..42e3b2b2e 100644
--- a/tests/getpart.pm
+++ b/tests/getpart.pm
@@ -214,7 +214,7 @@ sub showdiff {
my @out = `diff -u $file2 $file1 2>/dev/null`;
if(!$out[0]) {
- @out = `diff -c $file2 $file1 2>/dev/null`;
+ @out = `diff -c $file2 $file1 2>/dev/null`;
}
return @out;
diff --git a/tests/libtest/test1013.pl b/tests/libtest/test1013.pl
index 33127da4a..99ad524eb 100755
--- a/tests/libtest/test1013.pl
+++ b/tests/libtest/test1013.pl
@@ -3,8 +3,8 @@
# curl --version protocols/features
if ( $#ARGV != 2 )
{
- print "Usage: $0 curl-config-script curl-version-output-file features|protocols\n";
- exit 3;
+ print "Usage: $0 curl-config-script curl-version-output-file features|protocols\n";
+ exit 3;
}
my $what=$ARGV[2];
@@ -42,8 +42,8 @@ my $curlconfigproto = join ' ', @curl_config;
my $different = $curlproto ne $curlconfigproto;
if ($different) {
- print "Mismatch in $what lists:\n";
- print "curl: $curlproto\n";
- print "curl-config: $curlconfigproto\n";
+ print "Mismatch in $what lists:\n";
+ print "curl: $curlproto\n";
+ print "curl-config: $curlconfigproto\n";
}
exit $different;
diff --git a/tests/libtest/test1022.pl b/tests/libtest/test1022.pl
index 94b3cb04f..fad024e19 100755
--- a/tests/libtest/test1022.pl
+++ b/tests/libtest/test1022.pl
@@ -2,8 +2,8 @@
# Determine if curl-config --version matches the curl --version
if ( $#ARGV != 2 )
{
- print "Usage: $0 curl-config-script curl-version-output-file version|vernum\n";
- exit 3;
+ print "Usage: $0 curl-config-script curl-version-output-file version|vernum\n";
+ exit 3;
}
my $what=$ARGV[2];
@@ -23,23 +23,23 @@ open(CURLCONFIG, "sh $ARGV[0] --$what|") || die "Can't get curl-config --$what l
$_ = <CURLCONFIG>;
chomp;
if ( $what eq "version" ) {
- /^libcurl ([\.\d]+(-CVS)?)$/ ;
- $curlconfigversion = $1;
+ /^libcurl ([\.\d]+(-CVS)?)$/ ;
+ $curlconfigversion = $1;
}
else {
- # Convert hex version to decimal for comparison's sake
- /^(..)(..)(..)$/ ;
- $curlconfigversion = hex($1) . "." . hex($2) . "." . hex($3);
+ # Convert hex version to decimal for comparison's sake
+ /^(..)(..)(..)$/ ;
+ $curlconfigversion = hex($1) . "." . hex($2) . "." . hex($3);
- # Strip off the -CVS from the curl version if it's there
- $version =~ s/-CVS$//;
+ # Strip off the -CVS from the curl version if it's there
+ $version =~ s/-CVS$//;
}
close CURLCONFIG;
my $different = $version ne $curlconfigversion;
if ($different || !$version) {
- print "Mismatch in --version:\n";
- print "curl: $version\n";
- print "curl-config: $curlconfigversion\n";
- exit 1;
+ print "Mismatch in --version:\n";
+ print "curl: $version\n";
+ print "curl-config: $curlconfigversion\n";
+ exit 1;
}
diff --git a/tests/libtest/test307.pl b/tests/libtest/test307.pl
index b8e3214fc..469af3c21 100755
--- a/tests/libtest/test307.pl
+++ b/tests/libtest/test307.pl
@@ -2,13 +2,13 @@
# Determine if the given curl executable supports the 'openssl' SSL engine
if ( $#ARGV != 0 )
{
- print "Usage: $0 curl-executable\n";
- exit 3;
+ print "Usage: $0 curl-executable\n";
+ exit 3;
}
if (!open(CURL, "@ARGV[0] -s --engine list|"))
{
- print "Can't get SSL engine list\n";
- exit 2;
+ print "Can't get SSL engine list\n";
+ exit 2;
}
while( <CURL> )
{
diff --git a/tests/libtest/test610.pl b/tests/libtest/test610.pl
index c9542ca51..a900d94b4 100755
--- a/tests/libtest/test610.pl
+++ b/tests/libtest/test610.pl
@@ -2,32 +2,32 @@
# Perform simple file and directory manipulation in a portable way
if ( $#ARGV <= 0 )
{
- print "Usage: $0 mkdir|rmdir|rm|move|gone path1 [path2] [more commands...]\n";
- exit 1;
+ print "Usage: $0 mkdir|rmdir|rm|move|gone path1 [path2] [more commands...]\n";
+ exit 1;
}
use File::Copy;
while(@ARGV) {
- my $cmd = shift @ARGV;
- my $arg = shift @ARGV;
- if ($cmd eq "mkdir") {
- mkdir $arg || die "$!";
- }
- elsif ($cmd eq "rmdir") {
- rmdir $arg || die "$!";
- }
- elsif ($cmd eq "rm") {
- unlink $arg || die "$!";
- }
- elsif ($cmd eq "move") {
- my $arg2 = shift @ARGV;
- move($arg,$arg2) || die "$!";
- }
- elsif ($cmd eq "gone") {
- ! -e $arg || die "Path $arg exists";
- } else {
- print "Unsupported command $cmd\n";
- exit 1;
- }
+ my $cmd = shift @ARGV;
+ my $arg = shift @ARGV;
+ if ($cmd eq "mkdir") {
+ mkdir $arg || die "$!";
+ }
+ elsif ($cmd eq "rmdir") {
+ rmdir $arg || die "$!";
+ }
+ elsif ($cmd eq "rm") {
+ unlink $arg || die "$!";
+ }
+ elsif ($cmd eq "move") {
+ my $arg2 = shift @ARGV;
+ move($arg,$arg2) || die "$!";
+ }
+ elsif ($cmd eq "gone") {
+ ! -e $arg || die "Path $arg exists";
+ } else {
+ print "Unsupported command $cmd\n";
+ exit 1;
+ }
}
exit 0;
diff --git a/tests/libtest/test613.pl b/tests/libtest/test613.pl
index dc3b1fb2e..b4caaae07 100755
--- a/tests/libtest/test613.pl
+++ b/tests/libtest/test613.pl
@@ -4,102 +4,102 @@ use Time::Local;
if ( $#ARGV < 1 )
{
- print "Usage: $0 prepare|postprocess dir [logfile]\n";
- exit 1;
+ print "Usage: $0 prepare|postprocess dir [logfile]\n";
+ exit 1;
}
# <precheck> expects an error message on stdout
sub errout {
- print $_[0] . "\n";
- exit 1;
+ print $_[0] . "\n";
+ exit 1;
}
if ($ARGV[0] eq "prepare")
{
- my $dirname = $ARGV[1];
- mkdir $dirname || errout "$!";
- chdir $dirname;
+ my $dirname = $ARGV[1];
+ mkdir $dirname || errout "$!";
+ chdir $dirname;
- # Create the files in alphabetical order, to increase the chances
- # of receiving a consistent set of directory contents regardless
- # of whether the server alphabetizes the results or not.
- mkdir "asubdir" || errout "$!";
- chmod 0777, "asubdir";
+ # Create the files in alphabetical order, to increase the chances
+ # of receiving a consistent set of directory contents regardless
+ # of whether the server alphabetizes the results or not.
+ mkdir "asubdir" || errout "$!";
+ chmod 0777, "asubdir";
- open(FILE, ">plainfile.txt") || errout "$!";
- binmode FILE;
- print FILE "Test file to support curl test suite\n";
- close(FILE);
- utime time, timegm(0,0,12,1,0,100), "plainfile.txt";
- chmod 0666, "plainfile.txt";
+ open(FILE, ">plainfile.txt") || errout "$!";
+ binmode FILE;
+ print FILE "Test file to support curl test suite\n";
+ close(FILE);
+ utime time, timegm(0,0,12,1,0,100), "plainfile.txt";
+ chmod 0666, "plainfile.txt";
- open(FILE, ">rofile.txt") || errout "$!";
- binmode FILE;
- print FILE "Read-only test file to support curl test suite\n";
- close(FILE);
- utime time, timegm(0,0,12,31,11,100), "rofile.txt";
- chmod 0444, "rofile.txt";
+ open(FILE, ">rofile.txt") || errout "$!";
+ binmode FILE;
+ print FILE "Read-only test file to support curl test suite\n";
+ close(FILE);
+ utime time, timegm(0,0,12,31,11,100), "rofile.txt";
+ chmod 0444, "rofile.txt";
- exit 0;
+ exit 0;
}
elsif ($ARGV[0] eq "postprocess")
{
- my $dirname = $ARGV[1];
- my $logfile = $ARGV[2];
+ my $dirname = $ARGV[1];
+ my $logfile = $ARGV[2];
- # Clean up the test directory
- unlink "$dirname/rofile.txt";
- unlink "$dirname/plainfile.txt";
- rmdir "$dirname/asubdir";
+ # Clean up the test directory
+ unlink "$dirname/rofile.txt";
+ unlink "$dirname/plainfile.txt";
+ rmdir "$dirname/asubdir";
- rmdir $dirname || die "$!";
+ rmdir $dirname || die "$!";
- if ($logfile) {
- # Process the directory file to remove all information that
- # could be inconsistent from one test run to the next (e.g.
- # file date) or may be unsupported on some platforms (e.g.
- # Windows). Also, since 7.17.0, the sftp directory listing
- # format can be dependent on the server (with a recent
- # enough version of libssh2) so this script must also
- # canonicalize the format. Here are examples of the general
- # format supported:
- # -r--r--r-- 12 ausername grp 47 Dec 31 2000 rofile.txt
- # -r--r--r-- 1 1234 4321 47 Dec 31 2000 rofile.txt
- # The "canonical" format is similar to the first (which is
- # the one generated on a typical Linux installation):
- # -r-?r-?r-? 12 U U 47 Dec 31 2000 rofile.txt
+ if ($logfile) {
+ # Process the directory file to remove all information that
+ # could be inconsistent from one test run to the next (e.g.
+ # file date) or may be unsupported on some platforms (e.g.
+ # Windows). Also, since 7.17.0, the sftp directory listing
+ # format can be dependent on the server (with a recent
+ # enough version of libssh2) so this script must also
+ # canonicalize the format. Here are examples of the general
+ # format supported:
+ # -r--r--r-- 12 ausername grp 47 Dec 31 2000 rofile.txt
+ # -r--r--r-- 1 1234 4321 47 Dec 31 2000 rofile.txt
+ # The "canonical" format is similar to the first (which is
+ # the one generated on a typical Linux installation):
+ # -r-?r-?r-? 12 U U 47 Dec 31 2000 rofile.txt
- my @canondir;
- open(IN, "<$logfile") || die "$!";
- while (<IN>) {
- /^(.)(..).(..).(..).\s*(\S+)\s+\S+\s+\S+\s+(\S+)\s+(\S+\s+\S+\s+\S+)(.*)$/;
- if ($1 eq "d") {
- # Erase all directory metadata except for the name, as it is not
- # consistent for across all test systems and filesystems
- push @canondir, "d????????? N U U N ??? N NN:NN$8\n";
- } elsif ($1 eq "-") {
- # Erase user and group names, as they are not consistent across
- # all test systems
- my $line = sprintf("%s%s?%s?%s?%5d U U %15d %s%s\n", $1,$2,$3,$4,$5,$6,$7,$8);
- push @canondir, $line;
- } else {
- # Unexpected format; just pass it through and let the test fail
- push @canondir, $_;
- }
- }
- close(IN);
+ my @canondir;
+ open(IN, "<$logfile") || die "$!";
+ while (<IN>) {
+ /^(.)(..).(..).(..).\s*(\S+)\s+\S+\s+\S+\s+(\S+)\s+(\S+\s+\S+\s+\S+)(.*)$/;
+ if ($1 eq "d") {
+ # Erase all directory metadata except for the name, as it is not
+ # consistent for across all test systems and filesystems
+ push @canondir, "d????????? N U U N ??? N NN:NN$8\n";
+ } elsif ($1 eq "-") {
+ # Erase user and group names, as they are not consistent across
+ # all test systems
+ my $line = sprintf("%s%s?%s?%s?%5d U U %15d %s%s\n", $1,$2,$3,$4,$5,$6,$7,$8);
+ push @canondir, $line;
+ } else {
+ # Unexpected format; just pass it through and let the test fail
+ push @canondir, $_;
+ }
+ }
+ close(IN);
- @canondir = sort {substr($a,57) cmp substr($b,57)} @canondir;
- my $newfile = $logfile . ".new";
- open(OUT, ">$newfile") || die "$!";
- print OUT join('', @canondir);
- close(OUT);
+ @canondir = sort {substr($a,57) cmp substr($b,57)} @canondir;
+ my $newfile = $logfile . ".new";
+ open(OUT, ">$newfile") || die "$!";
+ print OUT join('', @canondir);
+ close(OUT);
- unlink $logfile;
- rename $newfile, $logfile;
- }
+ unlink $logfile;
+ rename $newfile, $logfile;
+ }
- exit 0;
+ exit 0;
}
print "Unsupported command $ARGV[0]\n";
exit 1;
diff --git a/tests/libtest/test75.pl b/tests/libtest/test75.pl
index 4d14b1e12..31cdfb8cc 100755
--- a/tests/libtest/test75.pl
+++ b/tests/libtest/test75.pl
@@ -2,12 +2,12 @@
# Check that the length of a given URL is correct
if ( $#ARGV != 1 )
{
- print "Usage: $0 string length\n";
- exit 3;
+ print "Usage: $0 string length\n";
+ exit 3;
}
if (length(@ARGV[0]) != @ARGV[1])
{
- print "Given host IP and port not supported\n";
- exit 1;
+ print "Given host IP and port not supported\n";
+ exit 1;
}
exit 0;
diff --git a/tests/memanalyze.pl b/tests/memanalyze.pl
index 232d2dde5..e9f9d2255 100755
--- a/tests/memanalyze.pl
+++ b/tests/memanalyze.pl
@@ -117,7 +117,7 @@ while(<FILE>) {
if($sizeataddr{$addr}>0) {
# this means weeeeeirdo
print "Mixed debug compile ($source:$linenum at line $lnum), rebuild curl now\n";
- print "We think $sizeataddr{$addr} bytes are already allocated at that memory address: $addr!\n";
+ print "We think $sizeataddr{$addr} bytes are already allocated at that memory address: $addr!\n";
}
$sizeataddr{$addr}=$size;
diff --git a/tests/runtests.pl b/tests/runtests.pl
index 04ecc4a19..4cdb47538 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -749,7 +749,7 @@ sub verifyftp {
unlink($verifylog) if(-f $verifylog);
if($proto eq "ftps") {
- $extra .= "--insecure --ftp-ssl-control ";
+ $extra .= "--insecure --ftp-ssl-control ";
}
elsif($proto eq "smtp") {
# SMTP is a bit different since it requires more options and it