Skip to content

Commit ed7add8

Browse files
authored
Adds WS check, and some cleanup (#6213)
1 parent 9c1b88a commit ed7add8

File tree

4 files changed

+25
-8
lines changed

4 files changed

+25
-8
lines changed

ci/jenkins/bin/build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ set -x
4848
${WERROR} \
4949
${DEBUG}
5050

51+
echo
5152
echo -n "Main build started at " && date
5253
${ATS_MAKE} ${ATS_MAKE_FLAGS} V=1 Q= || exit 1
5354
echo -n "Main build finished at " && date

ci/jenkins/bin/clang-format.sh

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,23 @@
1717
# limitations under the License.
1818

1919
cd "${WORKSPACE}/src"
20+
21+
# First, make sure there are no trailing WS!!!
22+
git grep -IE ' +$' | fgrep -v '.gold:'
23+
if [ "1" != "$?" ]; then
24+
echo "Error: Trailing whitespaces are not allowed!"
25+
echo "Error: Please run: git grep -IE ' +$'"
26+
exit 1
27+
fi
28+
2029
autoreconf -if && ./configure
21-
[ "0" != "$?" ] && exit -1
30+
[ "0" != "$?" ] && exit 1
2231

23-
${ATS_MAKE} -j clang-format
24-
[ "0" != "$?" ] && exit -1
32+
${ATS_MAKE} clang-format
33+
[ "0" != "$?" ] && exit 1
2534

2635
git diff --exit-code
27-
[ "0" != "$?" ] && exit -1
36+
[ "0" != "$?" ] && exit 1
2837

2938
# Normal exit
3039
exit 0

ci/jenkins/bin/github.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,17 +62,21 @@ autoreconf -if
6262
${DEBUG}
6363

6464
# Build and run regressions
65+
echo
6566
echo -n "Main build started at " && date
6667
${ATS_MAKE} ${ATS_MAKE_FLAGS} V=1 Q= || exit 1
6768
echo -n "Main build finished at " && date
6869
echo
6970
echo -n "Unit tests started at " && date
70-
${ATS_MAKE} check VERBOSE=Y V=1 && ${ATS_MAKE} install
71+
${ATS_MAKE} -j 2 check VERBOSE=Y V=1 && ${ATS_MAKE} install
7172
echo -n "Unit tests finished at " && date
7273

7374
[ -x ${INSTALL}/bin/traffic_server ] || exit 1
7475

76+
echo
77+
echo -n "Regression tests started at " && date
7578
${INSTALL}/bin/traffic_server -K -k -R 1
79+
echo -n "Regression tests finished at " && date
7680
[ "0" != "$?" ] && exit 1
7781

7882
exit 0

ci/jenkins/bin/regression.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,13 @@
1919
cd "${WORKSPACE}/${BUILD_NUMBER}/build"
2020
[ -d BUILDS ] && cd BUILDS
2121

22-
${ATS_MAKE} check VERBOSE=Y V=1 || exit 1
22+
echo
23+
echo -n "Unit tests started at " && date
24+
${ATS_MAKE} -j 2 check VERBOSE=Y V=1 || exit 1
25+
echo -n "Unit tests finished at " && date
2326
${ATS_MAKE} install || exit 1
2427

2528
echo
26-
echo -n "Unit tests started at " && date
29+
echo -n "Regression tests started at " && date
2730
"${WORKSPACE}/${BUILD_NUMBER}/install/bin/traffic_server" -k -K -R 1
28-
echo -n "Unit tests finished at " && date
31+
echo -n "Regression tests finished at " && date

0 commit comments

Comments
 (0)