[trafficserver] branch master updated: Use proper make wrapper, and parallelize

[zw...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git

The following commit(s) were added to refs/heads/master by this push:
       new  d8582f0   Use proper make wrapper, and parallelize
d8582f0 is described below

commit d8582f0610c015ae3a0a8e4823a34ef7f526b7d6
Author: Leif Hedstrom <zw...@apache.org>
AuthorDate: Sun May 21 14:27:09 2017 -0600

    Use proper make wrapper, and parallelize
---
 ci/jenkins/bin/clang-format.sh | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/ci/jenkins/bin/clang-format.sh b/ci/jenkins/bin/clang-format.sh
index 38a5e3f..2d5fbc1 100644
--- a/ci/jenkins/bin/clang-format.sh
+++ b/ci/jenkins/bin/clang-format.sh
@@ -20,8 +20,17 @@ cd "${WORKSPACE}/src"
 autoreconf -if && ./configure
 
 # Test clang-format, copy our version of clang-format if needed
-[ ! -d .git/fmt ] && cp -rp /home/jenkins/fmt .git
-make clang-format
+if [ ! -d .git/fmt ]; then
+    if [ -z "${ghprbTargetBranch}" ]; then
+	cp -rp /home/jenkins/clang-format/master .git/fmt
+    else
+	# This is for Github PR's, to make sure we use the right clang-format for the branch.
+	# This is not an issue on normal branch builds, since they will have the right .git/fmt.
+	cp -rp /home/jenkins/clang-format/${ghprbTargetBranch} .git/fmt
+    fi
+fi
+
+${ATS_MAKE} -j clang-format
 git diff --exit-code
 [ "0" != "$?" ] && exit -1
 

-- 
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>'].