From b9d5dc72d4313212bf0c00102e467551775f6cc0 Mon Sep 17 00:00:00 2001
From: Leif Hedstrom <zwoop@apache.org>
Date: Wed, 20 Nov 2019 15:54:58 +0800
Subject: [PATCH] Adds WS check, and some cleanup

---
 ci/jenkins/bin/build.sh        |  1 +
 ci/jenkins/bin/clang-format.sh | 17 +++++++++++++----
 ci/jenkins/bin/github.sh       |  6 +++++-
 ci/jenkins/bin/regression.sh   |  9 ++++++---
 4 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/ci/jenkins/bin/build.sh b/ci/jenkins/bin/build.sh
index fbdf1a51339..1e258af102a 100755
--- a/ci/jenkins/bin/build.sh
+++ b/ci/jenkins/bin/build.sh
@@ -48,6 +48,7 @@ set -x
     ${WERROR} \
     ${DEBUG}
 
+echo
 echo -n "Main build started at " && date
 ${ATS_MAKE} ${ATS_MAKE_FLAGS} V=1 Q= || exit 1
 echo -n "Main build finished at " && date
diff --git a/ci/jenkins/bin/clang-format.sh b/ci/jenkins/bin/clang-format.sh
index e6d1bc2f197..d60da3e4aab 100755
--- a/ci/jenkins/bin/clang-format.sh
+++ b/ci/jenkins/bin/clang-format.sh
@@ -17,14 +17,23 @@
 #  limitations under the License.
 
 cd "${WORKSPACE}/src"
+
+# First, make sure there are no trailing WS!!!
+git grep -IE ' +$' | fgrep -v '.gold:'
+if [ "1" != "$?" ]; then
+    echo "Error: Trailing whitespaces are not allowed!"
+    echo "Error: Please run: git grep -IE ' +$'"
+    exit 1
+fi
+
 autoreconf -if && ./configure
-[ "0" != "$?" ] && exit -1
+[ "0" != "$?" ] && exit 1
 
-${ATS_MAKE} -j clang-format
-[ "0" != "$?" ] && exit -1
+${ATS_MAKE} clang-format
+[ "0" != "$?" ] && exit 1
 
 git diff --exit-code
-[ "0" != "$?" ] && exit -1
+[ "0" != "$?" ] && exit 1
 
 # Normal exit
 exit 0
diff --git a/ci/jenkins/bin/github.sh b/ci/jenkins/bin/github.sh
index 22bd3ee268b..b7b2ebaac01 100755
--- a/ci/jenkins/bin/github.sh
+++ b/ci/jenkins/bin/github.sh
@@ -62,17 +62,21 @@ autoreconf -if
     ${DEBUG}
 
 # Build and run regressions
+echo
 echo -n "Main build started at " && date
 ${ATS_MAKE} ${ATS_MAKE_FLAGS} V=1 Q= || exit 1
 echo -n "Main build finished at " && date
 echo
 echo -n "Unit tests started at " && date
-${ATS_MAKE} check VERBOSE=Y V=1 &&  ${ATS_MAKE} install
+${ATS_MAKE} -j 2 check VERBOSE=Y V=1 && ${ATS_MAKE} install
 echo -n "Unit tests finished at " && date
 
 [ -x ${INSTALL}/bin/traffic_server ] || exit 1
 
+echo
+echo -n "Regression tests started at " && date
 ${INSTALL}/bin/traffic_server -K -k -R 1
+echo -n "Regression tests finished at " && date
 [ "0" != "$?" ] && exit 1
 
 exit 0
diff --git a/ci/jenkins/bin/regression.sh b/ci/jenkins/bin/regression.sh
index 0ead3924799..51ae5b8d0c5 100755
--- a/ci/jenkins/bin/regression.sh
+++ b/ci/jenkins/bin/regression.sh
@@ -19,10 +19,13 @@
 cd "${WORKSPACE}/${BUILD_NUMBER}/build"
 [ -d BUILDS ] && cd BUILDS
 
-${ATS_MAKE} check VERBOSE=Y V=1 || exit 1
+echo
+echo -n "Unit tests started at " && date
+${ATS_MAKE} -j 2 check VERBOSE=Y V=1 || exit 1
+echo -n "Unit tests finished at " && date
 ${ATS_MAKE} install || exit 1
 
 echo
-echo -n "Unit tests started at " && date
+echo -n "Regression tests started at " && date
 "${WORKSPACE}/${BUILD_NUMBER}/install/bin/traffic_server" -k -K -R 1
-echo -n "Unit tests finished at " && date
+echo -n "Regression tests finished at " && date