X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=scripts%2Fcommon%2Fscan-build.sh;h=478fff1f5045b7d37728ec324621e7bb12f709ea;hb=da09719d635dd3bd5e1688c8c1fe113dbfaccb0d;hp=7a703e1cf52de529402cd00e8e7e4b11480adf40;hpb=05b1bd91bac21de6fd5fbb3bbf2c239fc6256bf5;p=lttng-ci.git

diff --git a/scripts/common/scan-build.sh b/scripts/common/scan-build.sh
index 7a703e1..478fff1 100755
--- a/scripts/common/scan-build.sh
+++ b/scripts/common/scan-build.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -exu
+#!/bin/bash
 #
 # Copyright (C) 2015 Jonathan Rajotte-Julien <jonathan.rajotte-julien@efficios.com>
 # Copyright (C) 2019 Michael Jeanson <mjeanson@efficios.com>
@@ -16,6 +16,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+set -exu
+
 # Required variables
 WORKSPACE=${WORKSPACE:-}
 
@@ -34,7 +36,8 @@ SRCDIR="$WORKSPACE/src/$PROJECT_NAME"
 TMPDIR="$WORKSPACE/tmp"
 
 NPROC=$(nproc)
-export CFLAGS="-O0 -g -DDEBUG"
+export CFLAGS="-O0 -g"
+export CXXFLAGS="-O0 -g"
 
 # Directory to archive the scan-build report
 SCAN_BUILD_ARCHIVE="${WORKSPACE}/scan-build-archive"
@@ -75,11 +78,7 @@ lttng-tools)
 lttng-ust)
     CONF_OPTS="--enable-java-agent-all --enable-python-agent"
     BUILD_TYPE="autotools"
-    export CLASSPATH="/usr/share/java/log4j-1.2.jar"
-    ;;
-linux-rseq)
-    CONF_OPTS=""
-    BUILD_TYPE="linux-rseq"
+    export CLASSPATH="/usr/share/java/log4j-api.jar:/usr/share/java/log4j-core.jar:/usr/share/java/log4j-1.2.jar"
     ;;
 *)
     echo "Generic project, no configure options."
@@ -106,11 +105,6 @@ autotools)
 
     scan-build -k -o "${SCAN_BUILD_TMPDIR}" make -j"$NPROC" V=1
     ;;
-linux-rseq)
-    make defconfig
-    make -j"$NPROC" prepare
-    scan-build -k -o "${SCAN_BUILD_TMPDIR}" make -j"$NPROC" kernel/rseq.o kernel/do_on_cpu/core.o kernel/do_on_cpu/interpreter.o kernel/do_on_cpu/validate.o V=1
-    ;;
 *)
     echo "Unsupported build type: $BUILD_TYPE"
     exit 1