X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Fliburcu%2Fbuild.sh;h=e5a57e09a476dd28bcdfdb0ca3a95c9658473066;hb=776b0d3dc2e7ca76d357d29de3ae8efc2740720f;hp=5eeb71b931a7ff0a4d746ac8d55c472c8cd37921;hpb=1d56e325ac199eb068729afbb04b3e954cb23061;p=lttng-ci.git diff --git a/scripts/liburcu/build.sh b/scripts/liburcu/build.sh index 5eeb71b..e5a57e0 100755 --- a/scripts/liburcu/build.sh +++ b/scripts/liburcu/build.sh @@ -1,7 +1,7 @@ -#!/bin/bash -exu +#!/bin/bash # # Copyright (C) 2015 Jonathan Rajotte-Julien -# 2016-2019 Michael Jeanson +# Copyright (C) 2016-2020 Michael Jeanson # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,6 +16,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . +set -exu + # Version compare functions vercomp () { set +u @@ -69,6 +71,16 @@ verne() { [ "$res" -ne "0" ] } +failed_configure() { + # Assume we are in the configured build directory + echo "#################### BEGIN config.log ####################" + cat config.log + echo "#################### END config.log ####################" + + # End the build with failure + exit 1 +} + # Required variables WORKSPACE=${WORKSPACE:-} @@ -77,6 +89,8 @@ conf=${conf:-} build=${build:-} cc=${cc:-} +# Controls if the tests are run +USERSPACE_RCU_RUN_TESTS="${USERSPACE_RCU_RUN_TESTS:=yes}" SRCDIR="$WORKSPACE/src/liburcu" TMPDIR="$WORKSPACE/tmp" @@ -95,49 +109,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 @@ -153,36 +135,23 @@ 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="$PATH:/usr/perl5/bin" - export LD_ALTEXEC=/usr/bin/gld - export LD=/usr/bin/gld - export PYTHON="python3" - export PYTHON_CONFIG="python3-config" - ;; - -macosx) +macos*) export MAKE=make export TAR=tar export NPROC="getconf _NPROCESSORS_ONLN" 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.9" + export PYTHON_CONFIG="python3.9-config" + ;; + +freebsd*) + export MAKE=gmake + export TAR=tar + export NPROC="getconf _NPROCESSORS_ONLN" + export CPPFLAGS="-I/usr/local/include" + export LDFLAGS="-L/usr/local/lib" export PYTHON="python3" export PYTHON_CONFIG="python3-config" ;; @@ -196,6 +165,10 @@ macosx) ;; esac +# Print build env details +print_os || true +print_tooling || true + # Enter the source directory cd "$SRCDIR" @@ -256,7 +229,7 @@ oot) builddir=$(mktemp -d) cd "$builddir" - "$SRCDIR/configure" "${CONF_OPTS[@]}" + "$SRCDIR/configure" "${CONF_OPTS[@]}" || failed_configure ;; dist) @@ -264,7 +237,7 @@ dist) # Run configure and generate the tar file # in the source directory - ./configure + ./configure || failed_configure $MAKE dist # Create and enter a temporary build directory @@ -276,7 +249,7 @@ dist) $TAR xvf "$SRCDIR"/*.tar.* --strip 1 # Build in extracted source tree - ./configure "${CONF_OPTS[@]}" + ./configure "${CONF_OPTS[@]}" || failed_configure ;; oot-dist) @@ -287,7 +260,7 @@ oot-dist) cd "$builddir" # Run configure out of tree and generate the tar file - "$SRCDIR/configure" + "$SRCDIR/configure" || failed_configure $MAKE dist dist_srcdir="$(mktemp -d)" @@ -303,12 +276,12 @@ oot-dist) # Run configure from the extracted distribution tar, # out of the source tree - "$dist_srcdir/configure" "${CONF_OPTS[@]}" + "$dist_srcdir/configure" "${CONF_OPTS[@]}" || failed_configure ;; *) echo "Standard in-tree build" - ./configure "${CONF_OPTS[@]}" + ./configure "${CONF_OPTS[@]}" || failed_configure ;; esac @@ -322,14 +295,23 @@ $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 -# Only run regtest for 0.9 and up -if vergte "$PACKAGE_VERSION" "0.9"; then - $MAKE --keep-going regtest || failed_tests=1 -fi +if [ "$USERSPACE_RCU_RUN_TESTS" = "yes" ]; then + $MAKE --keep-going check || failed_tests=1 + # Only run regtest for 0.9 and up + if vergte "$PACKAGE_VERSION" "0.9"; then + $MAKE --keep-going regtest || failed_tests=1 + fi + + # 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" -# 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 0.11 did not produce TAP logs + if verlt "$PACKAGE_VERSION" "0.11"; 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 $MAKE clean