X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Fbabeltrace%2Fbuild.sh;h=56b9b436ef85961b7c7ab51703f52e32caaf3e7f;hb=776b0d3dc2e7ca76d357d29de3ae8efc2740720f;hp=614062ae72a3162c3e55866946a4dfc86ec4c5ce;hpb=f0d7e5b1aab598ec9a6a4b60a092f2a25df711b3;p=lttng-ci.git diff --git a/scripts/babeltrace/build.sh b/scripts/babeltrace/build.sh index 614062a..56b9b43 100755 --- a/scripts/babeltrace/build.sh +++ b/scripts/babeltrace/build.sh @@ -83,11 +83,13 @@ failed_configure() { # Required variables WORKSPACE=${WORKSPACE:-} -arch=${arch:-} +platform=${platform:-} conf=${conf:-} build=${build:-} cc=${cc:-} +# Controls if the tests are run +BABELTRACE_RUN_TESTS="${BABELTRACE_RUN_TESTS:=yes}" SRCDIR="$WORKSPACE/src/babeltrace" TMPDIR="$WORKSPACE/tmp" @@ -106,49 +108,17 @@ gcc) export CC=gcc export CXX=g++ ;; -gcc-4.8) - export CC=gcc-4.8 - export CXX=g++-4.8 - ;; -gcc-5) - export CC=gcc-5 - export CXX=g++-5 - ;; -gcc-6) - export CC=gcc-6 - export CXX=g++-6 - ;; -gcc-7) - export CC=gcc-7 - export CXX=g++-7 - ;; -gcc-8) - export CC=gcc-8 - export CXX=g++-8 +gcc-*) + export CC=gcc-${cc#gcc-} + export CXX=g++-${cc#gcc-} ;; clang) export CC=clang export CXX=clang++ ;; -clang-3.9) - export CC=clang-3.9 - export CXX=clang++-3.9 - ;; -clang-4.0) - export CC=clang-4.0 - export CXX=clang++-4.0 - ;; -clang-5.0) - export CC=clang-5.0 - export CXX=clang++-5.0 - ;; -clang-6.0) - export CC=clang-6.0 - export CXX=clang++-6.0 - ;; -clang-7) - export CC=clang-7 - export CXX=clang++-7 +clang-*) + export CC=clang-${cc#clang-} + export CXX=clang++-${cc#clang-} ;; *) if [ "x$cc" != "x" ]; then @@ -163,31 +133,7 @@ if [ "x${CC:-}" != "x" ]; then fi # Set platform variables -case "$arch" in -sol10-i386) - export MAKE=gmake - export TAR=gtar - export NPROC=gnproc - export PATH="/opt/csw/bin:/usr/ccs/bin:$PATH" - export CPPFLAGS="-I/opt/csw/include" - export LDFLAGS="-L/opt/csw/lib -R/opt/csw/lib" - export PKG_CONFIG_PATH="/opt/csw/lib/pkgconfig" - export PYTHON="python3" - export PYTHON_CONFIG="python3-config" - ;; - -sol11-i386) - export MAKE=gmake - export TAR=gtar - export NPROC=nproc - export PATH="/opt/csw/bin:$PATH:/usr/perl5/bin" - export LD_ALTEXEC=/usr/bin/gld - export LD=/usr/bin/gld - export PYTHON="python3" - export PYTHON_CONFIG="python3-config" - export PKG_CONFIG_PATH="/usr/lib/pkgconfig" - ;; - +case "$platform" in macos*) export MAKE=make export TAR=tar @@ -195,20 +141,11 @@ macos*) export PATH="/opt/local/bin:/opt/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin" export CPPFLAGS="-I/opt/local/include" export LDFLAGS="-L/opt/local/lib" - export PYTHON="python3" - export PYTHON_CONFIG="python3-config" + export PYTHON="python3.9" + export PYTHON_CONFIG="python3.9-config" ;; -cygwin) - export MAKE=make - export TAR=tar - export NPROC=nproc - export PYTHON="python3" - export PYTHON_CONFIG="python3-config" - rebase_dll=1 - ;; - -freebsd) +freebsd*) export MAKE=gmake export TAR=tar export NPROC="getconf _NPROCESSORS_ONLN" @@ -289,7 +226,13 @@ prod) unset BABELTRACE_MINIMAL_LOG_LEVEL # Enable the python bindings - CONF_OPTS+=("--enable-python-bindings" "--enable-python-bindings-doc" "--enable-python-plugins") + CONF_OPTS+=("--enable-python-bindings" "--enable-python-plugins") + ;; + +doc) + echo "Documentation configuration" + + CONF_OPTS+=("--enable-python-bindings" "--enable-python-bindings-doc" "--enable-python-plugins" "--enable-api-doc") ;; min) @@ -384,26 +327,23 @@ esac # BUILD! $MAKE -j "$($NPROC)" V=1 -# Force rebase DLL address mapping -if [ "${rebase_dll:-}" == "1" ]; then - find . -name "*.dll" -print0 | xargs -0 rebase -O -v -fi - # Install in the workspace $MAKE install DESTDIR="$WORKSPACE" # Run tests, don't fail now, we want to run the archiving steps failed_tests=0 -$MAKE --keep-going check || failed_tests=1 - -# Copy tap logs for the jenkins tap parser before cleaning the build dir -rsync -a --exclude 'test-suite.log' --include '*/' --include '*.log' --exclude='*' tests/ "$WORKSPACE/tap" - -# The test suite prior to 1.5 did not produce TAP logs -if verlt "$PACKAGE_VERSION" "1.5"; then - mkdir -p "$WORKSPACE/tap/no-log" - echo "1..1" > "$WORKSPACE/tap/no-log/tests.log" - echo "ok 1 - Test suite doesn't support logging" >> "$WORKSPACE/tap/no-log/tests.log" +if [ "$BABELTRACE_RUN_TESTS" = "yes" ]; then + $MAKE --keep-going check || failed_tests=1 + + # Copy tap logs for the jenkins tap parser before cleaning the build dir + rsync -a --exclude 'test-suite.log' --include '*/' --include '*.log' --exclude='*' tests/ "$WORKSPACE/tap" + + # The test suite prior to 1.5 did not produce TAP logs + if verlt "$PACKAGE_VERSION" "1.5"; then + mkdir -p "$WORKSPACE/tap/no-log" + echo "1..1" > "$WORKSPACE/tap/no-log/tests.log" + echo "ok 1 - Test suite doesn't support logging" >> "$WORKSPACE/tap/no-log/tests.log" + fi fi # Clean the build directory