Commit 4c883383d41de523f965eb85fb1dd7a74d3720bb
2020-05-18T15:52:51
checker-buildbot.sh: Use Ninja, not GNU make, and expect scan-build in $PATH.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73
diff --git a/build-scripts/checker-buildbot.sh b/build-scripts/checker-buildbot.sh
index cc16a50..e8f2f22 100755
--- a/build-scripts/checker-buildbot.sh
+++ b/build-scripts/checker-buildbot.sh
@@ -5,51 +5,10 @@
# back to the buildmaster. You might find it useful too.
# Install Clang (you already have it on Mac OS X, apt-get install clang
-# on Ubuntu, etc),
-# or download checker at http://clang-analyzer.llvm.org/ and unpack it in
-# /usr/local ... update CHECKERDIR as appropriate.
+# on Ubuntu, etc), and make sure scan-build is in your $PATH.
FINALDIR="$1"
-CHECKERDIR="/usr/local/checker-279"
-if [ ! -d "$CHECKERDIR" ]; then
- echo "$CHECKERDIR not found. Trying /usr/share/clang ..." 1>&2
- CHECKERDIR="/usr/share/clang/scan-build"
-fi
-
-if [ ! -d "$CHECKERDIR" ]; then
- echo "$CHECKERDIR not found. Giving up." 1>&2
- exit 1
-fi
-
-if [ -z "$MAKE" ]; then
- OSTYPE=`uname -s`
- if [ "$OSTYPE" == "Linux" ]; then
- NCPU=`cat /proc/cpuinfo |grep vendor_id |wc -l`
- let NCPU=$NCPU+1
- elif [ "$OSTYPE" = "Darwin" ]; then
- NCPU=`sysctl -n hw.ncpu`
- elif [ "$OSTYPE" = "SunOS" ]; then
- NCPU=`/usr/sbin/psrinfo |wc -l |sed -e 's/^ *//g;s/ *$//g'`
- else
- NCPU=1
- fi
-
- if [ -z "$NCPU" ]; then
- NCPU=1
- elif [ "$NCPU" = "0" ]; then
- NCPU=1
- fi
-
- MAKE="make -j$NCPU"
-fi
-
-echo "\$MAKE is '$MAKE'"
-
-# Unset $MAKE so submakes don't use it.
-MAKECOMMAND="$MAKE"
-unset MAKE
-
set -x
set -e
@@ -68,13 +27,13 @@ cd checker-buildbot
# The -Wno-liblto is new since our checker-279 upgrade, I think; checker otherwise warns "libLTO.dylib relative to clang installed dir not found"
# You might want to do this for CMake-backed builds instead...
-PATH="$CHECKERDIR/bin:$PATH" scan-build -o analysis cmake -Wno-dev -DSDL_STATIC=OFF -DCMAKE_BUILD_TYPE=Debug -DASSERTIONS=enabled -DCMAKE_C_FLAGS="-Wno-deprecated-declarations" -DCMAKE_SHARED_LINKER_FLAGS="-Wno-liblto" ..
+scan-build -o analysis cmake -G Ninja -Wno-dev -DSDL_STATIC=OFF -DCMAKE_BUILD_TYPE=Debug -DASSERTIONS=enabled -DCMAKE_C_FLAGS="-Wno-deprecated-declarations" -DCMAKE_SHARED_LINKER_FLAGS="-Wno-liblto" ..
# ...or run configure without the scan-build wrapper...
#CC="$CHECKERDIR/libexec/ccc-analyzer" CFLAGS="-O0 -Wno-deprecated-declarations" LDFLAGS="-Wno-liblto" ../configure --enable-assertions=enabled
rm -rf analysis
-PATH="$CHECKERDIR/bin:$PATH" scan-build -o analysis $MAKECOMMAND
+scan-build -o analysis ninja
if [ `ls -A analysis |wc -l` == 0 ] ; then
mkdir analysis/zarro