removed trailing whitespace

28 files changed, 83 insertions, 83 deletions

diff --git a/tests/README b/tests/README
index 8af798d93..be22778cd 100644
--- a/tests/README
+++ b/tests/README
@@ -1,7 +1,7 @@
-                                  _   _ ____  _     
-                              ___| | | |  _ \| |    
-                             / __| | | | |_) | |    
-                            | (__| |_| |  _ <| |___ 
+                                  _   _ ____  _
+                              ___| | | |  _ \| |
+                             / __| | | | |_) | |
+                            | (__| |_| |  _ <| |___
                              \___|\___/|_| \_\_____|
 
 The cURL Test Suite
@@ -156,5 +156,5 @@ TEST CASE NUMBERS
 TODO:
 
   * Add tests for TELNET, LDAP, DICT...
-  * SOCKS4/5 test deficiencies - no proxy authentication tests as SSH (the 
+  * SOCKS4/5 test deficiencies - no proxy authentication tests as SSH (the
     test mechanism) doesn't support them
diff --git a/tests/certs/scripts/genroot.sh b/tests/certs/scripts/genroot.sh
index 85425a8c5..b463e2c6e 100755
--- a/tests/certs/scripts/genroot.sh
+++ b/tests/certs/scripts/genroot.sh
@@ -3,7 +3,7 @@
 # (c) CopyRight EdelWeb for EdelKey and OpenEvidence, 2000-2004, 2009
 # Author: Peter Sylvester
 
-# "libre" for integration with curl 
+# "libre" for integration with curl
 
 OPENSSL=openssl
 if [ -f /usr/local/ssl/bin/openssl ] ; then
@@ -38,20 +38,20 @@ fi
 GETSERIAL="\$t = time ;\$d =  \$t . substr(\$t+$$ ,-4,4)-1;print \$d"
 SERIAL=`/usr/bin/env perl -e "$GETSERIAL"`
 
-echo SERIAL=$SERIAL PREFIX=$PREFIX DURATION=$DURATION KEYSIZE=$KEYSIZE 
+echo SERIAL=$SERIAL PREFIX=$PREFIX DURATION=$DURATION KEYSIZE=$KEYSIZE
 
 echo "openssl req -config $PREFIX-ca.prm -newkey rsa:$KEYSIZE -keyout $PREFIX-ca.key -out $PREFIX-ca.csr"
 $OPENSSL req -config $PREFIX-ca.prm -newkey rsa:$KEYSIZE -keyout $PREFIX-ca.key -out $PREFIX-ca.csr
 
 echo "openssl x509 -set_serial $SERIAL -extfile $PREFIX-ca.prm -days $DURATION -req -signkey $PREFIX-ca.key -in $PREFIX-ca.csr -out $PREFIX-$SERIAL.ca-cacert -sha1 "
 
-$OPENSSL x509  -set_serial $SERIAL -extfile $PREFIX-ca.prm -days $DURATION -req -signkey $PREFIX-ca.key -in $PREFIX-ca.csr -out $PREFIX-$SERIAL-ca.cacert -sha1 
+$OPENSSL x509  -set_serial $SERIAL -extfile $PREFIX-ca.prm -days $DURATION -req -signkey $PREFIX-ca.key -in $PREFIX-ca.csr -out $PREFIX-$SERIAL-ca.cacert -sha1
 
 echo "openssl x509 -text -hash -out $PREFIX-ca.cacert -in $PREFIX-$SERIAL-ca.cacert -nameopt multiline"
 $OPENSSL x509 -text -hash -out $PREFIX-ca.cacert -in $PREFIX-$SERIAL-ca.cacert -nameopt multiline
 
 echo "openssl x509 -in $PREFIX-ca.cacert -outform der -out $PREFIX-ca.der "
-$OPENSSL x509 -in $PREFIX-ca.cacert -outform der -out $PREFIX-ca.der 
+$OPENSSL x509 -in $PREFIX-ca.cacert -outform der -out $PREFIX-ca.der
 
 echo "openssl x509 -in $PREFIX-ca.cacert -text -out $PREFIX-ca.crt -nameopt multiline"
 
diff --git a/tests/certs/scripts/genserv.sh b/tests/certs/scripts/genserv.sh
index 13caf1a6a..61145d84b 100755
--- a/tests/certs/scripts/genserv.sh
+++ b/tests/certs/scripts/genserv.sh
@@ -3,7 +3,7 @@
 # (c) CopyRight EdelWeb for EdelKey and OpenEvidence, 2000-2004, 2009
 # Author: Peter Sylvester
 
-# "libre" for integration with curl 
+# "libre" for integration with curl
 
 OPENSSL=openssl
 if [ -f /usr/local/ssl/bin/openssl ] ; then
@@ -59,7 +59,7 @@ if [ ".$SERIAL" = . ] ; then
 	SERIAL=`/usr/bin/env perl -e "$GETSERIAL"`
 fi
 
-echo SERIAL=$SERIAL PREFIX=$PREFIX CAPREFIX=$CAPREFIX DURATION=$DURATION KEYSIZE=$KEYSIZE 
+echo SERIAL=$SERIAL PREFIX=$PREFIX CAPREFIX=$CAPREFIX DURATION=$DURATION KEYSIZE=$KEYSIZE
 
 if [ "$DHP." = YES. ] ; then
    echo "openssl dhparam -2 -out $PREFIX-sv.dhp $KEYSIZE"
@@ -72,7 +72,7 @@ if [ "$REQ." = YES. ] ; then
 fi
 
 echo "openssl rsa -in $PREFIX-sv.key -out $PREFIX-sv.key"
-$OPENSSL rsa -in $PREFIX-sv.key -out $PREFIX-sv.key -passin pass:secret 
+$OPENSSL rsa -in $PREFIX-sv.key -out $PREFIX-sv.key -passin pass:secret
 echo pseudo secrets generated
 read
 
@@ -84,7 +84,7 @@ if [ "$P12." = YES. ] ; then
 
    echo "$OPENSSL pkcs12 -export -des3 -out $PREFIX-sv.p12 -caname $CAPREFIX -name $PREFIX -inkey $PREFIX-sv.key -in $PREFIX-sv.crt -certfile $CAPREFIX-ca.crt "
 
-   $OPENSSL pkcs12 -export -des3 -out $PREFIX-sv.p12 -caname $CAPREFIX -name $PREFIX -inkey $PREFIX-sv.key -in $PREFIX-sv.crt -certfile $CAPREFIX-ca.crt 
+   $OPENSSL pkcs12 -export -des3 -out $PREFIX-sv.p12 -caname $CAPREFIX -name $PREFIX -inkey $PREFIX-sv.key -in $PREFIX-sv.crt -certfile $CAPREFIX-ca.crt
 
    read
 fi
@@ -93,14 +93,14 @@ echo "openssl x509 -noout -text -hash -in $PREFIX-sv.selfcert -nameopt multiline
 $OPENSSL x509 -noout -text -hash -in $PREFIX-sv.crt -nameopt multiline
 
 echo "openssl x509 -in $PREFIX-sv.crt -outform der -out $PREFIX-sv.der "
-$OPENSSL x509 -in $PREFIX-sv.crt -outform der -out $PREFIX-sv.der 
+$OPENSSL x509 -in $PREFIX-sv.crt -outform der -out $PREFIX-sv.der
 read
 
 # all together now
 touch $PREFIX-sv.dhp
 cat $PREFIX-sv.prm $PREFIX-sv.key  $PREFIX-sv.crt $PREFIX-sv.dhp >$PREFIX-sv.pem
-chmod o-r $PREFIX-sv.prm  
+chmod o-r $PREFIX-sv.prm
 
 echo "$PREFIX-sv.pem done"
 
- 
+
diff --git a/tests/ftpserver.pl b/tests/ftpserver.pl
index 51c38cf10..bc868cfd2 100644
--- a/tests/ftpserver.pl
+++ b/tests/ftpserver.pl
@@ -346,7 +346,7 @@ sub protocolsetup {
             'NLST' => \&NLST_ftp,
             'PASV' => \&PASV_ftp,
             'EPSV' => \&PASV_ftp,
-            'RETR' => \&RETR_ftp,   
+            'RETR' => \&RETR_ftp,
             'SIZE' => \&SIZE_ftp,
             'REST' => \&REST_ftp,
             'STOR' => \&STOR_ftp,
@@ -466,7 +466,7 @@ sub close_dataconn {
 }
 
 ################
-################ SMTP commands 
+################ SMTP commands
 ################
 
 # what set by "RCPT"
@@ -516,7 +516,7 @@ sub DATA_smtp {
             }
 
             sysread \*SFREAD, $line, $size;
-            
+
             $ulsize += $size;
             print FILE $line if(!$nosave);
 
@@ -556,7 +556,7 @@ sub RCPT_smtp {
 }
 
 ################
-################ IMAP commands 
+################ IMAP commands
 ################
 
 # global to allow the command functions to read it
@@ -624,12 +624,12 @@ sub FETCH_imap {
      }
 
      sendcontrol "$cmdid OK FETCH completed\r\n";
-    
+
      return 0;
 }
 
 ################
-################ POP3 commands 
+################ POP3 commands
 ################
 
 sub RETR_pop3 {
@@ -670,12 +670,12 @@ sub RETR_pop3 {
 
      # end with the magic 5-byte end of mail marker
      sendcontrol "\r\n.\r\n";
-    
+
      return 0;
 }
 
 ################
-################ FTP commands 
+################ FTP commands
 ################
 my $rest=0;
 sub REST_ftp {
@@ -837,7 +837,7 @@ sub RETR_ftp {
     my %hash = getpartattr("reply", "data$testpart");
 
     if($size || $hash{'sendzero'}) {
-    
+
         if($rest) {
             # move read pointer forward
             $size -= $rest;
@@ -903,7 +903,7 @@ sub STOR_ftp {
             }
 
             sysread DREAD, $line, $size;
-            
+
             #print STDERR "  GOT: $size bytes\n";
 
             $ulsize += $size;
@@ -960,7 +960,7 @@ sub PASV_ftp {
     # Find out what port we listen on
     my $i;
     print DWRITE "PORT\n";
-        
+
     # READ the response code
     sysread_or_die(\*DREAD, \$i, 5);
 
@@ -971,10 +971,10 @@ sub PASV_ftp {
     if($i =~ /^([0-9a-fA-F]{4})\n/) {
         $size = hex($1);
     }
-       
+
     # READ the response data
     sysread_or_die(\*DREAD, \$i, $size);
-        
+
     # The data is in the format
     # IPvX/NNN
 
@@ -1302,7 +1302,7 @@ logmsg("logged pid $$ in $pidfile\n");
 while(1) {
     #
     # We read 'sockfilt' commands.
-    # 
+    #
     my $input;
 
     logmsg "Awaiting input\n";
@@ -1322,7 +1322,7 @@ while(1) {
     $| = 1;
 
     killsockfilters($proto, $ipvnum, $idnum, $verbose, 'data');
- 
+
     &customize(); # read test control instructions
 
     sendcontrol @welcome;
@@ -1360,9 +1360,9 @@ while(1) {
 
         # data
         sysread SFREAD, $_, $size;
-        
+
         ftpmsg $_;
-        
+
         # Remove trailing CRLF.
         s/[\n\r]+$//;
 
@@ -1388,7 +1388,7 @@ while(1) {
             $FTPCMD=$1;
             $FTPARG=$2;
         }
-                 
+
         logmsg "< \"$full\"\n";
 
         if($verbose) {
@@ -1444,7 +1444,7 @@ while(1) {
             logmsg "$FTPCMD wasn't handled!\n";
             sendcontrol "500 $FTPCMD is not dealt with!\r\n";
         }
-            
+
     } # while(1)
     logmsg "====> Client disconnected\n";
 
diff --git a/tests/getpart.pm b/tests/getpart.pm
index 9ade56a19..7f426179b 100644
--- a/tests/getpart.pm
+++ b/tests/getpart.pm
@@ -199,7 +199,7 @@ sub showdiff {
 
     my $file1="$logdir/check-generated";
     my $file2="$logdir/check-expected";
-    
+
     open(TEMP, ">$file1");
     for(@$firstref) {
         print TEMP $_;
diff --git a/tests/libtest/CMakeLists.txt b/tests/libtest/CMakeLists.txt
index f0ee8cd2b..653e5315d 100644
--- a/tests/libtest/CMakeLists.txt
+++ b/tests/libtest/CMakeLists.txt
@@ -20,9 +20,9 @@ function(SETUP_TEST TEST_NAME)          # ARGN are the files in the test
   set_target_properties(${TEST_NAME}
     PROPERTIES PROJECT_LABEL "${TARGET_LABEL_PREFIX}${TEST_NAME}")
 
-  # Add the postfix to the executable since it is 
+  # Add the postfix to the executable since it is
   # not added automatically as for modules and shared libraries
-  set_target_properties(${TEST_NAME} 
+  set_target_properties(${TEST_NAME}
     PROPERTIES DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}")
 
   if(MSVC)
diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am
index 81a0606be..9c041d7f2 100644
--- a/tests/libtest/Makefile.am
+++ b/tests/libtest/Makefile.am
@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
-# Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
@@ -48,7 +48,7 @@ INCLUDES = -I$(top_builddir)/include/curl \
            -I$(top_builddir)/include      \
            -I$(top_srcdir)/include        \
            -I$(top_builddir)/lib          \
-           -I$(top_srcdir)/lib 
+           -I$(top_srcdir)/lib
 endif
 
 EXTRA_DIST = test75.pl test307.pl test610.pl test613.pl test1013.pl	\
diff --git a/tests/libtest/lib502.c b/tests/libtest/lib502.c
index 0a0a819b0..d1c734cc7 100644
--- a/tests/libtest/lib502.c
+++ b/tests/libtest/lib502.c
@@ -63,7 +63,7 @@ int test(char *URL)
 
   while (running) {
     res = (int)curl_multi_perform(m, &running);
-    if (tutil_tvdiff(tutil_tvnow(), mp_start) > 
+    if (tutil_tvdiff(tutil_tvnow(), mp_start) >
         MULTI_PERFORM_HANG_TIMEOUT) {
       mp_timedout = TRUE;
       break;
diff --git a/tests/libtest/lib507.c b/tests/libtest/lib507.c
index 252775840..306ba2da3 100644
--- a/tests/libtest/lib507.c
+++ b/tests/libtest/lib507.c
@@ -64,7 +64,7 @@ int test(char *URL)
 
   do {
     ret = curl_multi_perform(multi, &still_running);
-    if (tutil_tvdiff(tutil_tvnow(), mp_start) > 
+    if (tutil_tvdiff(tutil_tvnow(), mp_start) >
         MULTI_PERFORM_HANG_TIMEOUT) {
       mp_timedout = TRUE;
       break;
@@ -88,7 +88,7 @@ int test(char *URL)
     timeout.tv_sec = 1;
     timeout.tv_usec = 0;
 
-    if (tutil_tvdiff(tutil_tvnow(), ml_start) > 
+    if (tutil_tvdiff(tutil_tvnow(), ml_start) >
         MAIN_LOOP_HANG_TIMEOUT) {
       ml_timedout = TRUE;
       break;
@@ -105,7 +105,7 @@ int test(char *URL)
         mp_start = tutil_tvnow();
         do {
           ret = curl_multi_perform(multi, &still_running);
-          if (tutil_tvdiff(tutil_tvnow(), mp_start) > 
+          if (tutil_tvdiff(tutil_tvnow(), mp_start) >
               MULTI_PERFORM_HANG_TIMEOUT) {
             mp_timedout = TRUE;
             break;
diff --git a/tests/libtest/lib518.c b/tests/libtest/lib518.c
index d8310d92d..9d1ae96ac 100644
--- a/tests/libtest/lib518.c
+++ b/tests/libtest/lib518.c
@@ -216,7 +216,7 @@ static int rlimit(int keep_open)
 
   /*
    * verify that soft limit is higher than NUM_NEEDED,
-   * which is the number of file descriptors we would 
+   * which is the number of file descriptors we would
    * try to open plus SAFETY_MARGIN to not exhaust the
    * file descriptor pool
    */
@@ -329,8 +329,8 @@ static int rlimit(int keep_open)
 
   /* create a bunch of file descriptors */
 
-  for (num_open.rlim_cur = 1; 
-       num_open.rlim_cur < num_open.rlim_max; 
+  for (num_open.rlim_cur = 1;
+       num_open.rlim_cur < num_open.rlim_max;
        num_open.rlim_cur++) {
 
     fd[num_open.rlim_cur] = dup(fd[0]);
@@ -468,7 +468,7 @@ int test(char *URL)
     return TEST_ERR_MAJOR_BAD;
   }
 
-  /* run the test with the bunch of open file descriptors 
+  /* run the test with the bunch of open file descriptors
      and close them all once the test is over */
 
   if (curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) {
diff --git a/tests/libtest/lib526.c b/tests/libtest/lib526.c
index 89fddbc51..65fa2fd3a 100644
--- a/tests/libtest/lib526.c
+++ b/tests/libtest/lib526.c
@@ -129,7 +129,7 @@ int test(char *URL)
     interval.tv_sec = 1;
     interval.tv_usec = 0;
 
-    if (tutil_tvdiff(tutil_tvnow(), ml_start) > 
+    if (tutil_tvdiff(tutil_tvnow(), ml_start) >
         MAIN_LOOP_HANG_TIMEOUT) {
       ml_timedout = TRUE;
       break;
@@ -139,7 +139,7 @@ int test(char *URL)
 
     while (res == CURLM_CALL_MULTI_PERFORM) {
       res = (int)curl_multi_perform(m, &running);
-      if (tutil_tvdiff(tutil_tvnow(), mp_start) > 
+      if (tutil_tvdiff(tutil_tvnow(), mp_start) >
           MULTI_PERFORM_HANG_TIMEOUT) {
         mp_timedout = TRUE;
         break;
diff --git a/tests/libtest/lib530.c b/tests/libtest/lib530.c
index 3b0bd001c..01f35f765 100644
--- a/tests/libtest/lib530.c
+++ b/tests/libtest/lib530.c
@@ -141,7 +141,7 @@ int test(char *URL)
     interval.tv_sec = 1;
     interval.tv_usec = 0;
 
-    if (tutil_tvdiff(tutil_tvnow(), ml_start) > 
+    if (tutil_tvdiff(tutil_tvnow(), ml_start) >
         MAIN_LOOP_HANG_TIMEOUT) {
       ml_timedout = TRUE;
       break;
@@ -151,7 +151,7 @@ int test(char *URL)
 
     while (res == CURLM_CALL_MULTI_PERFORM) {
       res = (int)curl_multi_perform(m, &running);
-      if (tutil_tvdiff(tutil_tvnow(), mp_start) > 
+      if (tutil_tvdiff(tutil_tvnow(), mp_start) >
           MULTI_PERFORM_HANG_TIMEOUT) {
         mp_timedout = TRUE;
         break;
diff --git a/tests/libtest/lib533.c b/tests/libtest/lib533.c
index 810b075e5..42dfb1a41 100644
--- a/tests/libtest/lib533.c
+++ b/tests/libtest/lib533.c
@@ -79,7 +79,7 @@ int test(char *URL)
     interval.tv_sec = 1;
     interval.tv_usec = 0;
 
-    if (tutil_tvdiff(tutil_tvnow(), ml_start) > 
+    if (tutil_tvdiff(tutil_tvnow(), ml_start) >
         MAIN_LOOP_HANG_TIMEOUT) {
       ml_timedout = TRUE;
       break;
@@ -89,7 +89,7 @@ int test(char *URL)
 
     while (res == CURLM_CALL_MULTI_PERFORM) {
       res = (int)curl_multi_perform(m, &running);
-      if (tutil_tvdiff(tutil_tvnow(), mp_start) > 
+      if (tutil_tvdiff(tutil_tvnow(), mp_start) >
           MULTI_PERFORM_HANG_TIMEOUT) {
         mp_timedout = TRUE;
         break;
diff --git a/tests/libtest/lib536.c b/tests/libtest/lib536.c
index 06d863ca9..2300ce109 100644
--- a/tests/libtest/lib536.c
+++ b/tests/libtest/lib536.c
@@ -33,7 +33,7 @@ static CURLMcode perform(CURLM * multi)
 
   for (;;) {
     code = curl_multi_perform(multi, &handles);
-    if (tutil_tvdiff(tutil_tvnow(), mp_start) > 
+    if (tutil_tvdiff(tutil_tvnow(), mp_start) >
         MULTI_PERFORM_HANG_TIMEOUT) {
       mp_timedout = TRUE;
       break;
diff --git a/tests/libtest/lib537.c b/tests/libtest/lib537.c
index 791448a86..b15cb8ac1 100644
--- a/tests/libtest/lib537.c
+++ b/tests/libtest/lib537.c
@@ -204,7 +204,7 @@ static int rlimit(int keep_open)
   /*
    * test 537 is all about testing libcurl functionality
    * when the system has nearly exhausted the number of
-   * available file descriptors. Test 537 will try to run 
+   * available file descriptors. Test 537 will try to run
    * with a very small number of file descriptors available.
    * This implies that any file descriptor which is open
    * when the test runs will have a number in the high range
@@ -323,8 +323,8 @@ static int rlimit(int keep_open)
 
   /* create a bunch of file descriptors */
 
-  for (num_open.rlim_cur = 1; 
-       num_open.rlim_cur < num_open.rlim_max; 
+  for (num_open.rlim_cur = 1;
+       num_open.rlim_cur < num_open.rlim_max;
        num_open.rlim_cur++) {
 
     fd[num_open.rlim_cur] = dup(fd[0]);
@@ -471,7 +471,7 @@ int test(char *URL)
     return TEST_ERR_MAJOR_BAD;
   }
 
-  /* run the test with the bunch of open file descriptors 
+  /* run the test with the bunch of open file descriptors
      and close them all once the test is over */
 
   if (curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) {
diff --git a/tests/libtest/lib556.c b/tests/libtest/lib556.c
index 26ae30ccd..583723d22 100644
--- a/tests/libtest/lib556.c
+++ b/tests/libtest/lib556.c
@@ -46,7 +46,7 @@ int test(char *URL)
 
   if(!res) {
     /* we are connected, now get a HTTP document the raw way */
-    const char *request = 
+    const char *request =
 #ifdef CURL_DOES_CONVERSIONS
       /* ASCII representation with escape sequences for non-ASCII platforms */
       "\x47\x45\x54\x20\x2f\x35\x35\x36\x20\x48\x54\x54\x50\x2f\x31\x2e"
diff --git a/tests/libtest/lib558.c b/tests/libtest/lib558.c
index 253e043e1..7ed991dd3 100644
--- a/tests/libtest/lib558.c
+++ b/tests/libtest/lib558.c
@@ -88,7 +88,7 @@ int test(char *URL)
   CURL *easyh = NULL;
   struct curl_hash *hp = NULL;
   int result = 0;
- 
+
   if(!strcmp(URL, "check")) {
     /* test harness script verifying if this test can run */
     return 0; /* sure, run this! */
diff --git a/tests/libtest/test1013.pl b/tests/libtest/test1013.pl
index 8ab1a8c95..33127da4a 100755
--- a/tests/libtest/test1013.pl
+++ b/tests/libtest/test1013.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 # Determine if curl-config --protocols/--features matches the
 # curl --version protocols/features
-if ( $#ARGV != 2 ) 
+if ( $#ARGV != 2 )
 {
 	print "Usage: $0 curl-config-script curl-version-output-file features|protocols\n";
 	exit 3;
diff --git a/tests/libtest/test1022.pl b/tests/libtest/test1022.pl
index 5b16de3e0..94b3cb04f 100755
--- a/tests/libtest/test1022.pl
+++ b/tests/libtest/test1022.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 # Determine if curl-config --version matches the curl --version
-if ( $#ARGV != 2 ) 
+if ( $#ARGV != 2 )
 {
 	print "Usage: $0 curl-config-script curl-version-output-file version|vernum\n";
 	exit 3;
diff --git a/tests/libtest/test307.pl b/tests/libtest/test307.pl
index 7e2687b54..b8e3214fc 100755
--- a/tests/libtest/test307.pl
+++ b/tests/libtest/test307.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 # Determine if the given curl executable supports the 'openssl' SSL engine
-if ( $#ARGV != 0 ) 
+if ( $#ARGV != 0 )
 {
 	print "Usage: $0 curl-executable\n";
 	exit 3;
diff --git a/tests/libtest/test610.pl b/tests/libtest/test610.pl
index 5257171a7..c9542ca51 100755
--- a/tests/libtest/test610.pl
+++ b/tests/libtest/test610.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 # Perform simple file and directory manipulation in a portable way
-if ( $#ARGV <= 0 ) 
+if ( $#ARGV <= 0 )
 {
 	print "Usage: $0 mkdir|rmdir|rm|move|gone path1 [path2] [more commands...]\n";
 	exit 1;
diff --git a/tests/libtest/test613.pl b/tests/libtest/test613.pl
index ba9ed32e9..dc3b1fb2e 100755
--- a/tests/libtest/test613.pl
+++ b/tests/libtest/test613.pl
@@ -2,7 +2,7 @@
 # Prepare a directory with known files and clean up afterwards
 use Time::Local;
 
-if ( $#ARGV < 1 ) 
+if ( $#ARGV < 1 )
 {
 	print "Usage: $0 prepare|postprocess dir [logfile]\n";
 	exit 1;
diff --git a/tests/libtest/test75.pl b/tests/libtest/test75.pl
index 01a53ff15..4d14b1e12 100755
--- a/tests/libtest/test75.pl
+++ b/tests/libtest/test75.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 # Check that the length of a given URL is correct
-if ( $#ARGV != 1 ) 
+if ( $#ARGV != 1 )
 {
 	print "Usage: $0 string length\n";
 	exit 3;
diff --git a/tests/memanalyze.pl b/tests/memanalyze.pl
index 763f9a3b9..232d2dde5 100755
--- a/tests/memanalyze.pl
+++ b/tests/memanalyze.pl
@@ -176,7 +176,7 @@ while(<FILE>) {
 
             newtotal($totalmem);
             $reallocs++;
-            
+
             $getmem{$oldaddr}="";
             $getmem{$newaddr}="$source:$linenum";
         }
@@ -192,7 +192,7 @@ while(<FILE>) {
             $totalmem += $size;
 
             if($trace) {
-                printf("STRDUP: $size bytes at %s, makes totally: %d bytes\n", 
+                printf("STRDUP: $size bytes at %s, makes totally: %d bytes\n",
                        $getmem{$addr}, $totalmem);
             }
 
@@ -201,7 +201,7 @@ while(<FILE>) {
         }
         else {
             print "Not recognized input line: $function\n";
-        }        
+        }
     }
     # FD url.c:1282 socket() = 5
     elsif($_ =~ /^FD ([^ ]*):(\d*) (.*)/) {
@@ -297,7 +297,7 @@ while(<FILE>) {
                 printf("FREEADDRINFO ($source:$linenum)\n");
             }
         }
-       
+
     }
     else {
         print "Not recognized prefix line: $line\n";
diff --git a/tests/runtests.pl b/tests/runtests.pl
index 7d10ef4fc..04ecc4a19 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -23,7 +23,7 @@
 ###########################################################################
 
 # Experimental hooks are available to run tests remotely on machines that
-# are able to run curl but are unable to run the test harness.  
+# are able to run curl but are unable to run the test harness.
 # The following sections need to be modified:
 #
 #  $HOSTIP, $HOST6IP - Set to the address of the host running the test suite
@@ -3694,7 +3694,7 @@ EOHELP
         exit;
     }
     shift @ARGV;
-} 
+}
 
 if(@testthis && ($testthis[0] ne "")) {
     $TESTCASES=join(" ", @testthis);
diff --git a/tests/server/CMakeLists.txt b/tests/server/CMakeLists.txt
index 99ec3d897..0401df215 100644
--- a/tests/server/CMakeLists.txt
+++ b/tests/server/CMakeLists.txt
@@ -11,8 +11,8 @@ function(SETUP_EXECUTABLE TEST_NAME)    # ARGN are the files in the test
     )
   if(CURL_USE_ARES)
     include_directories(${CARES_INCLUDE_DIR})
-  endif()  
-  # resolve test needs this 
+  endif()
+  # resolve test needs this
   setup_curl_dependencies(${TEST_NAME})
   #TARGET_LINK_LIBRARIES( ${TEST_NAME} libcurl )
 
@@ -23,13 +23,13 @@ function(SETUP_EXECUTABLE TEST_NAME)    # ARGN are the files in the test
   # files on Win32 targets it is necessary to build the test servers
   # with CURL_STATICLIB defined, independently of how libcurl is built.
   if(NOT CURL_STATICLIB)
-    set_target_properties(${TEST_NAME} PROPERTIES 
+    set_target_properties(${TEST_NAME} PROPERTIES
       COMPILE_DEFINITIONS CURL_STATICLIB)       # ${UPPER_TEST_NAME}
   endif()
-  set_target_properties(${TEST_NAME} PROPERTIES 
+  set_target_properties(${TEST_NAME} PROPERTIES
     PROJECT_LABEL "${TARGET_LABEL_PREFIX}${TEST_NAME}")
 
-  # Add the postfix to the executable since it is not added 
+  # Add the postfix to the executable since it is not added
   # automatically as for modules and shared libraries
   set_target_properties(${TEST_NAME} PROPERTIES
     DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}")
@@ -45,7 +45,7 @@ function(SETUP_EXECUTABLE TEST_NAME)    # ARGN are the files in the test
 endfunction()
 
 
-transform_makefile_inc("Makefile.inc" 
+transform_makefile_inc("Makefile.inc"
   "${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake")
 include(${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake)
 
diff --git a/tests/testcurl.1 b/tests/testcurl.1
index 9b98eea21..d106211f9 100644
--- a/tests/testcurl.1
+++ b/tests/testcurl.1
@@ -5,7 +5,7 @@
 .\" *                            | (__| |_| |  _ <| |___
 .\" *                             \___|\___/|_| \_\_____|
 .\" *
-.\" * Copyright (C) 1998 - 2005, Daniel Stenberg, <daniel@haxx.se>, et al.
+.\" * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
 .\" *
 .\" * This software is licensed as described in the file COPYING, which
 .\" * you should have received as part of this distribution. The terms
@@ -120,7 +120,7 @@ testprog="perl ./curl/tests/testcurl.pl $name $email $desc"
 opts1="--configure=--enable-debug"
 opts2="--configure=--enable-ipv6"
 
-# run first test 
+# run first test
 $testprog $opts1 | $mail
 
 # run second test
diff --git a/tests/valgrind.pm b/tests/valgrind.pm
index 82efe2f8a..b8c2594ef 100644
--- a/tests/valgrind.pm
+++ b/tests/valgrind.pm
@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
-# Copyright (C) 1998 - 2005, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
@@ -92,7 +92,7 @@ sub valgrindparse {
                 # us use OpenSSL. OpenSSL produces numerous valgrind
                 # errors of this kind, rendering it impossible for us to
                 # detect (valid) reports on actual curl or libcurl code.
-                
+
                 if(!$sslenabled) {
                     $uninitedvar = 1;
                     $error++;