[trafficserver] branch master updated: More fixes to the CI builds for C++17

[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 b969b22  More fixes to the CI builds for C++17
b969b22 is described below

commit b969b22bc67795fbaf677579c93b10a94f7128e9
Author: Leif Hedstrom <zw...@apache.org>
AuthorDate: Wed May 16 16:25:55 2018 -0600

    More fixes to the CI builds for C++17
---
 ci/jenkins/bin/autest.sh         | 4 +++-
 ci/jenkins/bin/clang-analyzer.sh | 1 +
 ci/jenkins/bin/coverity.sh       | 3 ++-
 ci/jenkins/bin/environment.sh    | 6 ++++++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ci/jenkins/bin/autest.sh b/ci/jenkins/bin/autest.sh
index 1df5fa4..786ace7 100755
--- a/ci/jenkins/bin/autest.sh
+++ b/ci/jenkins/bin/autest.sh
@@ -17,7 +17,6 @@
 #  limitations under the License.
 
 set +x
-[ -d tests ] || exit 0
 
 INSTALL="${WORKSPACE}/${BUILD_NUMBER}/install"
 URL="https://ci.trafficserver.apache.org/autest"
@@ -37,6 +36,9 @@ WCCP=""
 mkdir -p ${INSTALL}
 cd src
 
+# The tests directory must exist (i.e. for older branches we don't run this)
+[ -d tests ] || exit 0
+
 echo "CCACHE: $CCACHE"
 echo "WERROR: $WERROR"
 echo "DEBUG: $DEBUG"
diff --git a/ci/jenkins/bin/clang-analyzer.sh b/ci/jenkins/bin/clang-analyzer.sh
index 8f462f8..f01955d 100755
--- a/ci/jenkins/bin/clang-analyzer.sh
+++ b/ci/jenkins/bin/clang-analyzer.sh
@@ -27,6 +27,7 @@ NOCLEAN=${NOCLEAN:-}
 OUTPUT_BASE=${OUTPUT_BASE:-/home/jenkins/clang-analyzer}
 
 # Options
+#options="--status-bugs --keep-empty"
 options="--keep-empty"
 configure="--enable-experimental-plugins"
 
diff --git a/ci/jenkins/bin/coverity.sh b/ci/jenkins/bin/coverity.sh
index 3fc98b0..b7a19ad 100755
--- a/ci/jenkins/bin/coverity.sh
+++ b/ci/jenkins/bin/coverity.sh
@@ -19,6 +19,7 @@
 cd "${WORKSPACE}/src"
 
 # Get the Coverity tools into our path
+source /opt/rh/devtoolset-7/enable
 export PATH=/home/coverity/bin:${PATH}
 
 COV_TARBALL=/tmp/trafficserver-${TODAY}.tgz
@@ -27,7 +28,7 @@ COV_VERSION=$(git rev-parse --short HEAD)
 autoreconf -fi
 ./configure --enable-experimental-plugins --enable-wccp
 
-cov-build --dir cov-int ${ATS_MAKE} -j4
+cov-build --dir cov-int ${ATS_MAKE} -j4 V=1
 tar czvf ${COV_TARBALL} cov-int
 
 # Now submit this artifact
diff --git a/ci/jenkins/bin/environment.sh b/ci/jenkins/bin/environment.sh
index 8aa0c97..d48b8d2 100755
--- a/ci/jenkins/bin/environment.sh
+++ b/ci/jenkins/bin/environment.sh
@@ -61,8 +61,13 @@ test "${JOB_NAME#*compiler=clang}" != "${JOB_NAME}" && enable_clang=1
 
 if [ "1" == "$enable_clang" ]; then
 	if [ -x "/usr/local/bin/clang++50" ]; then
+		# For FreeBSD
 		export CC="/usr/local/bin/clang50"
 		export CXX="/usr/local/bin/clang++50"
+	elif [ -x "/usr/bin/clang++-5.0" ]; then
+		# For Ubuntu 17.x
+		export CC="/usr/bin/clang-5.0"
+		export CXX="/usr/bin/clang++-5.0"
 	else
 		export CC="clang"
 		export CXX="clang++"
@@ -70,6 +75,7 @@ if [ "1" == "$enable_clang" ]; then
 	export CXXFLAGS="-Qunused-arguments"
 	export WITH_LIBCPLUSPLUS="yes"
 elif [ "1" == "$enable_icc" ]; then
+	source /opt/rh/devtoolset-7/enable
 	source /opt/intel/bin/iccvars.sh intel64
 	export CC=icc
 	export CXX=icpc

-- 
To stop receiving notification emails like this one, please contact
zwoop@apache.org.