From ab41267e9fee18f1015b6a68ec8824678c781d82 Mon Sep 17 00:00:00 2001 From: Tim Angus Date: Thu, 28 Aug 2014 09:13:38 +0100 Subject: [PATCH] Only run scan-build on one of the clang builds --- jenkins-ci-build.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/jenkins-ci-build.sh b/jenkins-ci-build.sh index f5559de4..31bdd97f 100755 --- a/jenkins-ci-build.sh +++ b/jenkins-ci-build.sh @@ -6,7 +6,7 @@ BUILD_DEFAULT="release" cd ${MASTER_DIR} -if [ "$OPTIONS" = "all_options" ]; +if [ "${OPTIONS}" == "all_options" ]; then export USE_CODEC_VORBIS=1 export USE_FREETYPE=1 @@ -44,7 +44,8 @@ if [ -n "${CPPCHECK}" ]; then ln -sf ${CPPCHECK} cppcheck.xml fi -if [ "${CC}" == "clang" ]; then +# Bit of a hack; only run scan-build with clang and all options enabled +if [ "${CC}" == "clang" ] && [ "${OPTIONS}" == "all_options" ]; then MAKE_PREFIX="scan-build" fi