whitespace fixes

- replace tabs with spaces where possible
- remove line ending spaces
- remove double/triple newlines at EOF
- fix a non-UTF-8 character
- cleanup a few indentations/line continuations
  in manual examples

Closes https://github.com/curl/curl/pull/3037

67 files changed, 39 insertions, 104 deletions

diff --git a/tests/certs/EdelCurlRoot-ca.prm b/tests/certs/EdelCurlRoot-ca.prm
index d0eff4894..2e8104730 100644
--- a/tests/certs/EdelCurlRoot-ca.prm
+++ b/tests/certs/EdelCurlRoot-ca.prm
@@ -15,4 +15,3 @@ commonName_value              = Northern Nowhere Trust Anchor
 basicConstraints = critical,CA:true
 keyUsage        = critical,keyCertSign,cRLSign
 subjectKeyIdentifier = hash
-
diff --git a/tests/certs/scripts/Makefile.am b/tests/certs/scripts/Makefile.am
index db4a90f54..1db622204 100644
--- a/tests/certs/scripts/Makefile.am
+++ b/tests/certs/scripts/Makefile.am
@@ -26,4 +26,3 @@ SCRIPTFILES = \
   genserv.sh
 
 EXTRA_DIST = $(SCRIPTFILES)
-
diff --git a/tests/certs/scripts/genroot.sh b/tests/certs/scripts/genroot.sh
index 5dd9fac95..f66fc6554 100755
--- a/tests/certs/scripts/genroot.sh
+++ b/tests/certs/scripts/genroot.sh
@@ -22,19 +22,19 @@ DIGESTALGO=-sha256
 
 PREFIX=$1
 if [ ".$PREFIX" = . ] ; then
-	echo No configuration prefix
-	NOTOK=1
+   echo No configuration prefix
+   NOTOK=1
 else
-    if [ ! -f $PREFIX-ca.prm ] ; then
-	echo No configuration file $PREFIX-ca.prm
-	NOTOK=1
-    fi
+   if [ ! -f $PREFIX-ca.prm ] ; then
+      echo No configuration file $PREFIX-ca.prm
+      NOTOK=1
+   fi
 fi
 
 if [ ".$NOTOK" != . ] ; then
-    echo "Sorry, I can't do that for you."
-    $USAGE
-    exit
+   echo "Sorry, I can't do that for you."
+   $USAGE
+   exit
 fi
 
 GETSERIAL="\$t = time ;\$d =  \$t . substr(\$t+$$ ,-4,4)-1;print \$d"
diff --git a/tests/certs/scripts/genserv.sh b/tests/certs/scripts/genserv.sh
index 99f44ccee..f0f440320 100755
--- a/tests/certs/scripts/genserv.sh
+++ b/tests/certs/scripts/genserv.sh
@@ -26,39 +26,39 @@ DHP=NO
 
 PREFIX=$1
 if [ ".$PREFIX" = . ] ; then
-	echo No configuration prefix
-	NOTOK=1
+   echo No configuration prefix
+   NOTOK=1
 else
-    if [ ! -f $PREFIX-sv.prm ] ; then
-	echo No configuration file $PREFIX-sv.prm
-	NOTOK=1
-    fi
+   if [ ! -f $PREFIX-sv.prm ] ; then
+      echo No configuration file $PREFIX-sv.prm
+      NOTOK=1
+   fi
 fi
 
 CAPREFIX=$2
 if [ ".$CAPREFIX" = . ] ; then
-	echo No CA prefix
-	NOTOK=1
+   echo No CA prefix
+   NOTOK=1
 else
-    if [ ! -f $CAPREFIX-ca.cacert ] ; then
-	echo No CA certificate file $CAPREFIX-ca.caert
-	NOTOK=1
-    fi
-    if [ ! -f $CAPREFIX-ca.key ] ; then
-	echo No $CAPREFIX key
-        NOTOK=1
-    fi
+   if [ ! -f $CAPREFIX-ca.cacert ] ; then
+      echo No CA certificate file $CAPREFIX-ca.caert
+      NOTOK=1
+   fi
+   if [ ! -f $CAPREFIX-ca.key ] ; then
+      echo No $CAPREFIX key
+      NOTOK=1
+   fi
 fi
 
 if [ ".$NOTOK" != . ] ; then
-    echo "Sorry, I can't do that for you."
-    $USAGE
-    exit
+   echo "Sorry, I can't do that for you."
+   $USAGE
+   exit
 fi
 
 if [ ".$SERIAL" = . ] ; then
-	GETSERIAL="\$t = time ;\$d =  \$t . substr(\$t+$$ ,-4,4)-1;print \$d"
-	SERIAL=`/usr/bin/env perl -e "$GETSERIAL"`
+   GETSERIAL="\$t = time ;\$d =  \$t . substr(\$t+$$ ,-4,4)-1;print \$d"
+   SERIAL=`/usr/bin/env perl -e "$GETSERIAL"`
 fi
 
 echo SERIAL=$SERIAL PREFIX=$PREFIX CAPREFIX=$CAPREFIX DURATION=$DURATION KEYSIZE=$KEYSIZE
@@ -116,5 +116,3 @@ cat $PREFIX-sv.prm $PREFIX-sv.key  $PREFIX-sv.crt $PREFIX-sv.dhp >$PREFIX-sv.pem
 chmod o-r $PREFIX-sv.prm
 
 echo "$PREFIX-sv.pem done"
-
-
diff --git a/tests/data/DISABLED b/tests/data/DISABLED
index 0fb5b92e5..61bdf1351 100644
--- a/tests/data/DISABLED
+++ b/tests/data/DISABLED
@@ -28,4 +28,3 @@
 1901
 1902
 2033
-
diff --git a/tests/data/test1020 b/tests/data/test1020
index 735871d6b..61032fb17 100644
--- a/tests/data/test1020
+++ b/tests/data/test1020
@@ -39,4 +39,3 @@ file
 </stdout>
 </verify>
 </testcase>
-
diff --git a/tests/data/test1408 b/tests/data/test1408
index 54d5e7778..bf775ed39 100644
--- a/tests/data/test1408
+++ b/tests/data/test1408
@@ -71,4 +71,3 @@ Cookie: time=1
 </protocol>
 </verify>
 </testcase>
-
diff --git a/tests/data/test567 b/tests/data/test567
index de0f63273..4f91c85f0 100644
--- a/tests/data/test567
+++ b/tests/data/test567
@@ -47,4 +47,3 @@ Test-Number: 567
 </verify>
 
 </testcase>
-
diff --git a/tests/data/test568 b/tests/data/test568
index 09fa81ce2..372866dca 100644
--- a/tests/data/test568
+++ b/tests/data/test568
@@ -114,4 +114,3 @@ CSeq: 4
 </verify>
 
 </testcase>
-
diff --git a/tests/data/test569 b/tests/data/test569
index ea6cd0bb0..924832c11 100644
--- a/tests/data/test569
+++ b/tests/data/test569
@@ -108,4 +108,3 @@ Got Session ID: [A]
 </verify>
 
 </testcase>
-
diff --git a/tests/data/test570 b/tests/data/test570
index 65f32a5be..431c79afc 100644
--- a/tests/data/test570
+++ b/tests/data/test570
@@ -74,4 +74,3 @@ Session: asdf
 </verify>
 
 </testcase>
-
diff --git a/tests/data/test571 b/tests/data/test571
index 494ac416b..842410ad6 100644
--- a/tests/data/test571
+++ b/tests/data/test571
@@ -105,4 +105,3 @@ $99
 </verify>
 
 </testcase>
-
diff --git a/tests/data/test572 b/tests/data/test572
index 903ded967..7f044478d 100644
--- a/tests/data/test572
+++ b/tests/data/test572
@@ -119,4 +119,3 @@ Session: getparams-test
 </verify>
 
 </testcase>
-
diff --git a/tests/fuzz/download_fuzzer.sh b/tests/fuzz/download_fuzzer.sh
index 28228e004..8c70b56e1 100755
--- a/tests/fuzz/download_fuzzer.sh
+++ b/tests/fuzz/download_fuzzer.sh
@@ -5,4 +5,3 @@ set -ex
 
 # Clone the curl-fuzzer repository to the specified directory.
 git clone http://github.com/curl/curl-fuzzer $1
-
diff --git a/tests/keywords.pl b/tests/keywords.pl
index 33748bd37..7ab907fe3 100755
--- a/tests/keywords.pl
+++ b/tests/keywords.pl
@@ -120,7 +120,7 @@ sub show {
     return $ret;
 }
 
-# sort alphabetically 
+# sort alphabetically
 my @mtest = reverse sort { lc($b) cmp lc($a) } keys %k;
 
 print <<TOP
diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am
index dc97e327e..56c84a765 100644
--- a/tests/libtest/Makefile.am
+++ b/tests/libtest/Makefile.am
@@ -44,8 +44,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/include        \
               -I$(top_srcdir)/lib
 endif
 
-EXTRA_DIST = test75.pl test307.pl test610.pl test613.pl test1013.pl	\
-test1022.pl Makefile.inc notexists.pl CMakeLists.txt mk-lib1521.pl
+EXTRA_DIST = test75.pl test307.pl test610.pl test613.pl test1013.pl \
+  test1022.pl Makefile.inc notexists.pl CMakeLists.txt mk-lib1521.pl
 
 CFLAG_CURL_SYMBOL_HIDING = @CFLAG_CURL_SYMBOL_HIDING@
 
diff --git a/tests/libtest/lib1507.c b/tests/libtest/lib1507.c
index 5e3a5926a..dc023a079 100644
--- a/tests/libtest/lib1507.c
+++ b/tests/libtest/lib1507.c
@@ -147,5 +147,3 @@ test_cleanup:
 
   return res;
 }
-
-
diff --git a/tests/libtest/lib1512.c b/tests/libtest/lib1512.c
index 5e794b293..1c2578958 100644
--- a/tests/libtest/lib1512.c
+++ b/tests/libtest/lib1512.c
@@ -88,4 +88,3 @@ test_cleanup:
 
   return res;
 }
-
diff --git a/tests/libtest/lib1520.c b/tests/libtest/lib1520.c
index 4d5b0c88c..c6ac64bb4 100644
--- a/tests/libtest/lib1520.c
+++ b/tests/libtest/lib1520.c
@@ -111,5 +111,3 @@ test_cleanup:
 
   return (int)res;
 }
-
-
diff --git a/tests/libtest/lib1526.c b/tests/libtest/lib1526.c
index 704ae497d..663465799 100644
--- a/tests/libtest/lib1526.c
+++ b/tests/libtest/lib1526.c
@@ -101,4 +101,3 @@ test_cleanup:
 
   return (int)res;
 }
-
diff --git a/tests/libtest/lib1531.c b/tests/libtest/lib1531.c
index 953f062d8..4a4dc133a 100644
--- a/tests/libtest/lib1531.c
+++ b/tests/libtest/lib1531.c
@@ -155,4 +155,3 @@ test_cleanup:
 
   return res;
 }
-
diff --git a/tests/libtest/lib1533.c b/tests/libtest/lib1533.c
index ada94b940..962a222ec 100644
--- a/tests/libtest/lib1533.c
+++ b/tests/libtest/lib1533.c
@@ -197,4 +197,3 @@ test_cleanup:
 
   return (int)res;
 }
-
diff --git a/tests/libtest/lib500.c b/tests/libtest/lib500.c
index 2a6c58bb5..8d9b92129 100644
--- a/tests/libtest/lib500.c
+++ b/tests/libtest/lib500.c
@@ -154,4 +154,3 @@ test_cleanup:
 
   return (int)res;
 }
-
diff --git a/tests/libtest/lib501.c b/tests/libtest/lib501.c
index af65bd4d7..4549cb648 100644
--- a/tests/libtest/lib501.c
+++ b/tests/libtest/lib501.c
@@ -56,4 +56,3 @@ test_cleanup:
 
   return (int)res;
 }
-
diff --git a/tests/libtest/lib502.c b/tests/libtest/lib502.c
index ce4bc47d1..df8905c84 100644
--- a/tests/libtest/lib502.c
+++ b/tests/libtest/lib502.c
@@ -89,4 +89,3 @@ test_cleanup:
 
   return res;
 }
-
diff --git a/tests/libtest/lib503.c b/tests/libtest/lib503.c
index 15b45f95b..00791edf5 100644
--- a/tests/libtest/lib503.c
+++ b/tests/libtest/lib503.c
@@ -99,4 +99,3 @@ test_cleanup:
 
   return res;
 }
-
diff --git a/tests/libtest/lib504.c b/tests/libtest/lib504.c
index 771b2038a..8d1fe506e 100644
--- a/tests/libtest/lib504.c
+++ b/tests/libtest/lib504.c
@@ -111,4 +111,3 @@ test_cleanup:
 
   return res;
 }
-
diff --git a/tests/libtest/lib506.c b/tests/libtest/lib506.c
index 5ed4f37ea..9f656e032 100644
--- a/tests/libtest/lib506.c
+++ b/tests/libtest/lib506.c
@@ -377,4 +377,3 @@ test_cleanup:
 
   return res;
 }
-
diff --git a/tests/libtest/lib509.c b/tests/libtest/lib509.c
index 4f3e072ae..59ced355f 100644
--- a/tests/libtest/lib509.c
+++ b/tests/libtest/lib509.c
@@ -144,4 +144,3 @@ test_cleanup:
 
   return (int)res;
 }
-
diff --git a/tests/libtest/lib512.c b/tests/libtest/lib512.c
index 0c83ddd53..8a6f0e149 100644
--- a/tests/libtest/lib512.c
+++ b/tests/libtest/lib512.c
@@ -72,4 +72,3 @@ int test(char *URL)
 
   return rc;
 }
-
diff --git a/tests/libtest/lib519.c b/tests/libtest/lib519.c
index 5c55aebe6..73da7d5ca 100644
--- a/tests/libtest/lib519.c
+++ b/tests/libtest/lib519.c
@@ -60,4 +60,3 @@ test_cleanup:
 
   return (int)res;
 }
-
diff --git a/tests/libtest/lib521.c b/tests/libtest/lib521.c
index b7efca0be..8d9aa2e2c 100644
--- a/tests/libtest/lib521.c
+++ b/tests/libtest/lib521.c
@@ -54,4 +54,3 @@ test_cleanup:
 
   return (int)res;
 }
-
diff --git a/tests/libtest/lib523.c b/tests/libtest/lib523.c
index 44aa2e2e9..450438939 100644
--- a/tests/libtest/lib523.c
+++ b/tests/libtest/lib523.c
@@ -55,4 +55,3 @@ test_cleanup:
 
   return (int)res;
 }
-
diff --git a/tests/libtest/lib524.c b/tests/libtest/lib524.c
index 08fd34dfc..fe0a8ed21 100644
--- a/tests/libtest/lib524.c
+++ b/tests/libtest/lib524.c
@@ -53,4 +53,3 @@ test_cleanup:
 
   return (int)res;
 }
-
diff --git a/tests/libtest/lib547.c b/tests/libtest/lib547.c
index 3db4890de..3cfc81d29 100644
--- a/tests/libtest/lib547.c
+++ b/tests/libtest/lib547.c
@@ -128,4 +128,3 @@ test_cleanup:
 
   return (int)res;
 }
-
diff --git a/tests/libtest/lib549.c b/tests/libtest/lib549.c
index 1d832b536..bb41cd619 100644
--- a/tests/libtest/lib549.c
+++ b/tests/libtest/lib549.c
@@ -63,4 +63,3 @@ test_cleanup:
 
   return (int)res;
 }
-
diff --git a/tests/libtest/lib555.c b/tests/libtest/lib555.c
index c887b56f0..42c89d8c9 100644
--- a/tests/libtest/lib555.c
+++ b/tests/libtest/lib555.c
@@ -161,4 +161,3 @@ test_cleanup:
 
   return res;
 }
-
diff --git a/tests/libtest/lib556.c b/tests/libtest/lib556.c
index 884f413aa..69b2c09dd 100644
--- a/tests/libtest/lib556.c
+++ b/tests/libtest/lib556.c
@@ -106,4 +106,3 @@ test_cleanup:
 
   return (int)res;
 }
-
diff --git a/tests/libtest/lib558.c b/tests/libtest/lib558.c
index 09a50d6b6..d9969738a 100644
--- a/tests/libtest/lib558.c
+++ b/tests/libtest/lib558.c
@@ -50,4 +50,3 @@ int test(char *URL)
 
   return (int)res;
 }
-
diff --git a/tests/libtest/lib559.c b/tests/libtest/lib559.c
index 8c72dbd0c..be112b8f3 100644
--- a/tests/libtest/lib559.c
+++ b/tests/libtest/lib559.c
@@ -53,4 +53,3 @@ test_cleanup:
 
   return (int)res;
 }
-
diff --git a/tests/libtest/lib566.c b/tests/libtest/lib566.c
index ecf8c5530..257738a4f 100644
--- a/tests/libtest/lib566.c
+++ b/tests/libtest/lib566.c
@@ -65,4 +65,3 @@ test_cleanup:
 
   return (int)res;
 }
-
diff --git a/tests/libtest/lib567.c b/tests/libtest/lib567.c
index 64fb29afb..7a730d26a 100644
--- a/tests/libtest/lib567.c
+++ b/tests/libtest/lib567.c
@@ -67,4 +67,3 @@ test_cleanup:
 
   return (int)res;
 }
-
diff --git a/tests/libtest/lib568.c b/tests/libtest/lib568.c
index 3bb53f61e..c1388f16f 100644
--- a/tests/libtest/lib568.c
+++ b/tests/libtest/lib568.c
@@ -175,4 +175,3 @@ test_cleanup:
 
   return res;
 }
-
diff --git a/tests/libtest/lib569.c b/tests/libtest/lib569.c
index c18c882b9..9c25db45d 100644
--- a/tests/libtest/lib569.c
+++ b/tests/libtest/lib569.c
@@ -125,4 +125,3 @@ test_cleanup:
 
   return res;
 }
-
diff --git a/tests/libtest/lib570.c b/tests/libtest/lib570.c
index 1756a8615..d88f100f3 100644
--- a/tests/libtest/lib570.c
+++ b/tests/libtest/lib570.c
@@ -113,4 +113,3 @@ test_cleanup:
 
   return res;
 }
-
diff --git a/tests/libtest/lib571.c b/tests/libtest/lib571.c
index 70524f2f2..c048747d9 100644
--- a/tests/libtest/lib571.c
+++ b/tests/libtest/lib571.c
@@ -212,4 +212,3 @@ test_cleanup:
 
   return res;
 }
-
diff --git a/tests/libtest/lib572.c b/tests/libtest/lib572.c
index a78c9358d..82d5049d0 100644
--- a/tests/libtest/lib572.c
+++ b/tests/libtest/lib572.c
@@ -181,4 +181,3 @@ test_cleanup:
 
   return res;
 }
-
diff --git a/tests/libtest/lib573.c b/tests/libtest/lib573.c
index eb817b1ed..e80824d16 100644
--- a/tests/libtest/lib573.c
+++ b/tests/libtest/lib573.c
@@ -111,4 +111,3 @@ test_cleanup:
 
   return res;
 }
-
diff --git a/tests/libtest/lib586.c b/tests/libtest/lib586.c
index a831b83d4..247422483 100644
--- a/tests/libtest/lib586.c
+++ b/tests/libtest/lib586.c
@@ -244,4 +244,3 @@ test_cleanup:
 
   return res;
 }
-
diff --git a/tests/libtest/lib590.c b/tests/libtest/lib590.c
index cc3afdf06..db433fb9e 100644
--- a/tests/libtest/lib590.c
+++ b/tests/libtest/lib590.c
@@ -69,4 +69,3 @@ int test(char *URL)
 
   return (int)res;
 }
-
diff --git a/tests/libtest/lib598.c b/tests/libtest/lib598.c
index c27e60b14..bd544701e 100644
--- a/tests/libtest/lib598.c
+++ b/tests/libtest/lib598.c
@@ -70,4 +70,3 @@ test_cleanup:
 
   return (int)res;
 }
-
diff --git a/tests/libtest/libauthretry.c b/tests/libtest/libauthretry.c
index e9dc0508b..8e348ad19 100644
--- a/tests/libtest/libauthretry.c
+++ b/tests/libtest/libauthretry.c
@@ -145,4 +145,3 @@ test_cleanup:
 
   return (int)res;
 }
-
diff --git a/tests/libtest/sethostname.h b/tests/libtest/sethostname.h
index 1a1c0775b..7a590428b 100644
--- a/tests/libtest/sethostname.h
+++ b/tests/libtest/sethostname.h
@@ -38,4 +38,3 @@
 
 LIBHOSTNAME_EXTERN int FUNCALLCONV
   gethostname(char *name, GETHOSTNAME_TYPE_ARG2 namelen);
-
diff --git a/tests/libtest/stub_gssapi.h b/tests/libtest/stub_gssapi.h
index 9a302f0f5..95726d794 100644
--- a/tests/libtest/stub_gssapi.h
+++ b/tests/libtest/stub_gssapi.h
@@ -180,4 +180,3 @@ OM_uint32 gss_display_status(OM_uint32 * /*minor_status*/,
                              gss_buffer_t /*status_string*/);
 
 #endif /* HEADER_CURL_GSSAPI_STUBS_H */
-
diff --git a/tests/libtest/testtrace.c b/tests/libtest/testtrace.c
index 3f9eedd80..0a98d006f 100644
--- a/tests/libtest/testtrace.c
+++ b/tests/libtest/testtrace.c
@@ -142,4 +142,3 @@ int libtest_debug_cb(CURL *handle, curl_infotype type,
   libtest_debug_dump(timebuf, text, stderr, data, size, trace_cfg->nohex);
   return 0;
 }
-
diff --git a/tests/libtest/testtrace.h b/tests/libtest/testtrace.h
index fafdf2992..a09ce348f 100644
--- a/tests/libtest/testtrace.h
+++ b/tests/libtest/testtrace.h
@@ -34,4 +34,3 @@ int libtest_debug_cb(CURL *handle, curl_infotype type,
                      void *userp);
 
 #endif /* HEADER_LIBTEST_TESTTRACE_H */
-
diff --git a/tests/libtest/testutil.h b/tests/libtest/testutil.h
index f2aeae642..6c063ea57 100644
--- a/tests/libtest/testutil.h
+++ b/tests/libtest/testutil.h
@@ -42,4 +42,3 @@ double tutil_tvdiff_secs(struct timeval t1, struct timeval t2);
 
 
 #endif  /* HEADER_CURL_LIBTEST_TESTUTIL_H */
-
diff --git a/tests/pathhelp.pm b/tests/pathhelp.pm
index bd91c91bf..3a413b22e 100644
--- a/tests/pathhelp.pm
+++ b/tests/pathhelp.pm
@@ -181,7 +181,7 @@ sub get_win32_current_drive {
 sub do_msys_transform;
 
 # Internal function. Gets two parameters: first parameter must be single
-# drive letter ('c'), second optional parameter is path relative to drive's 
+# drive letter ('c'), second optional parameter is path relative to drive's
 # current working directory. Returns Win32 absolute normalized path.
 sub get_abs_path_on_win32_drive;
 
@@ -455,7 +455,7 @@ sub build_sys_abs_path {
 
         my $has_final_slash = ($path =~ m{[\\/]$});
 
-        # Resolve relative directories, as they may be not resolved for 
+        # Resolve relative directories, as they may be not resolved for
         # Unix-style paths.
         # Remove duplicated slashes, as they may be not processed.
         $path = normalize_path($path);
@@ -624,7 +624,7 @@ sub do_msys_transform {
 }
 
 # Internal function. Gets two parameters: first parameter must be single
-# drive letter ('c'), second optional parameter is path relative to drive's 
+# drive letter ('c'), second optional parameter is path relative to drive's
 # current working directory. Returns Win32 absolute normalized path.
 sub get_abs_path_on_win32_drive {
     my ($drv, $rel_path) = @_;
diff --git a/tests/server/CMakeLists.txt b/tests/server/CMakeLists.txt
index 9d2a43164..78b9b7029 100644
--- a/tests/server/CMakeLists.txt
+++ b/tests/server/CMakeLists.txt
@@ -57,4 +57,3 @@ endforeach()
 # SETUP_EXECUTABLE(sockfilt sockfilt.c util.c util.h ${useful} ${CURL_SOURCE_DIR}/lib/inet_pton.c)
 # SETUP_EXECUTABLE(getpart testpart.c ${useful})
 # SETUP_EXECUTABLE(tftpd tftpd.c util.c util.h ${useful} tftp.h)
-
diff --git a/tests/server/rtspd.c b/tests/server/rtspd.c
index 4519eab60..0629d8a53 100644
--- a/tests/server/rtspd.c
+++ b/tests/server/rtspd.c
@@ -1481,4 +1481,3 @@ server_cleanup:
   logmsg("========> rtspd quits");
   return 0;
 }
-
diff --git a/tests/server/sockfilt.c b/tests/server/sockfilt.c
index 10a16ef00..86a1ff52d 100644
--- a/tests/server/sockfilt.c
+++ b/tests/server/sockfilt.c
@@ -1563,4 +1563,3 @@ sockfilt_cleanup:
   logmsg("============> sockfilt quits");
   return 0;
 }
-
diff --git a/tests/server/sws.c b/tests/server/sws.c
index fbe7761d8..8df4d76e4 100644
--- a/tests/server/sws.c
+++ b/tests/server/sws.c
@@ -2425,4 +2425,3 @@ sws_cleanup:
   logmsg("========> sws quits");
   return 0;
 }
-
diff --git a/tests/server/testpart.c b/tests/server/testpart.c
index 77f148640..7d31e5183 100644
--- a/tests/server/testpart.c
+++ b/tests/server/testpart.c
@@ -47,4 +47,3 @@ int main(int argc, char **argv)
   }
   return 0;
 }
-
diff --git a/tests/serverhelp.pm b/tests/serverhelp.pm
index a83a12584..7c9808c82 100644
--- a/tests/serverhelp.pm
+++ b/tests/serverhelp.pm
@@ -244,4 +244,3 @@ sub datasockf_logfilename {
 #***************************************************************************
 # End of library
 1;
-
diff --git a/tests/sshhelp.pm b/tests/sshhelp.pm
index c5618a109..7345eb300 100644
--- a/tests/sshhelp.pm
+++ b/tests/sshhelp.pm
@@ -451,4 +451,3 @@ sub sshversioninfo {
 #***************************************************************************
 # End of library
 1;
-
diff --git a/tests/unit/Makefile.inc b/tests/unit/Makefile.inc
index 5811ab476..141950c80 100644
--- a/tests/unit/Makefile.inc
+++ b/tests/unit/Makefile.inc
@@ -5,10 +5,10 @@ UNITFILES = curlcheck.h \
  ../libtest/first.c
 
 # These are all unit test programs
-UNITPROGS = unit1300 unit1301 unit1302 unit1303 unit1304 unit1305 unit1307	\
+UNITPROGS = unit1300 unit1301 unit1302 unit1303 unit1304 unit1305 unit1307 \
  unit1308 unit1309 unit1323 \
- unit1330 unit1394 unit1395 unit1396 unit1397 unit1398	\
- unit1399	\
+ unit1330 unit1394 unit1395 unit1396 unit1397 unit1398 \
+ unit1399 \
  unit1600 unit1601 unit1602 unit1603 unit1604 unit1605 unit1606 unit1607 \
  unit1608 unit1609 unit1620 \
  unit1650
diff --git a/tests/unit/curlcheck.h b/tests/unit/curlcheck.h
index 46cb84aaf..c358afa6e 100644
--- a/tests/unit/curlcheck.h
+++ b/tests/unit/curlcheck.h
@@ -99,4 +99,3 @@ unit_test_abort:                                \
   }                                             \
   return unitfail;                              \
   }
-