From 2c34ea1488ea3241038be5ef41a099ea14d42041 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Fri, 28 Apr 2023 14:40:15 -0400 Subject: [PATCH] jjb: cleanup many build.sh Change-Id: Iefde7953c739329bfe381db4b0d23edfa9fd10e3 Signed-off-by: Michael Jeanson --- scripts/barectf/build.sh | 18 +-- scripts/common/check-format.sh | 9 +- scripts/common/coverity.sh | 19 +--- scripts/common/override-build-std.sh | 16 +-- scripts/common/print.sh | 16 +-- scripts/librseq/build.sh | 149 +++++++++++++++--------- scripts/liburcu/build.sh | 162 +++++++++++++++++++-------- scripts/lttng-tools/build.sh | 10 +- scripts/lttng-ust/build.sh | 159 +++++++++++++++++--------- 9 files changed, 340 insertions(+), 218 deletions(-) diff --git a/scripts/barectf/build.sh b/scripts/barectf/build.sh index cd0c31c..577a2c3 100755 --- a/scripts/barectf/build.sh +++ b/scripts/barectf/build.sh @@ -1,19 +1,7 @@ #!/bin/sh # -# Copyright (C) 2015-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 -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# SPDX-FileCopyrightText: 2015-2023 Michael Jeanson +# SPDX-License-Identifier: GPL-2.0-or-later set -exu @@ -31,7 +19,7 @@ fi virtualenv -p $PYTHON3 "$PYENV_HOME" set +u -# shellcheck disable=SC1090 +# shellcheck disable=SC1090,SC1091 . "$PYENV_HOME/bin/activate" set -u diff --git a/scripts/common/check-format.sh b/scripts/common/check-format.sh index db9505d..88d0d33 100644 --- a/scripts/common/check-format.sh +++ b/scripts/common/check-format.sh @@ -1,4 +1,5 @@ #!/bin/bash +# # SPDX-FileCopyrightText: 2023 Michael Jeanson # SPDX-License-Identifier: GPL-2.0-or-later @@ -32,10 +33,12 @@ git diff -U0 --no-color --relative HEAD^ | clang-format-diff-14 -p1 -i # If the tree has local changes, the formatting was incorrect GIT_DIFF_OUTPUT=$(git diff) if [ -n "$GIT_DIFF_OUTPUT" ]; then - print_header "Saving clang-format proposed fixes in clang-format-fixes.diff" - git diff > "$WORKSPACE/clang-format-fixes.diff" - exit 1 + print_header "Saving clang-format proposed fixes in clang-format-fixes.diff" + git diff > "$WORKSPACE/clang-format-fixes.diff" + exit 1 fi print_header "clang-format is happy!" + # EOF +# vim: expandtab tabstop=4 shiftwidth=4 diff --git a/scripts/common/coverity.sh b/scripts/common/coverity.sh index a757a17..d707ad2 100755 --- a/scripts/common/coverity.sh +++ b/scripts/common/coverity.sh @@ -1,20 +1,8 @@ #!/bin/bash # -# Copyright (C) 2023 Michael Jeanson -# Copyright (C) 2015 Jonathan Rajotte-Julien -# -# 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 -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# SPDX-FileCopyrightText: 2015 Jonathan Rajotte-Julien +# SPDX-FileCopyrightText: 2023 Michael Jeanson +# SPDX-License-Identifier: GPL-2.0-or-later set -exu @@ -47,6 +35,7 @@ TMPDIR="$WORKSPACE/tmp" NPROC=$(nproc) PLATFORM=$(uname) export CFLAGS="-O0 -g -DDEBUG" +export CXXFLAGS="-O0 -g -DDEBUG" # Cache the tool installer in the home directory since we delete the workspace # on each build diff --git a/scripts/common/override-build-std.sh b/scripts/common/override-build-std.sh index 658c01f..472e89e 100755 --- a/scripts/common/override-build-std.sh +++ b/scripts/common/override-build-std.sh @@ -1,19 +1,7 @@ #!/bin/bash # -# Copyright (C) 2020 Jonathan Rajotte-Julien -# -# 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 -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# SPDX-FileCopyrightText: 2020 Jonathan Rajotte-Julien +# SPDX-License-Identifier: GPL-2.0-or-later # This file should be used as a jenkins job builder RAW import allowing the # override of the "build" variable on shell builder execution. diff --git a/scripts/common/print.sh b/scripts/common/print.sh index 5da4444..e13ddd0 100755 --- a/scripts/common/print.sh +++ b/scripts/common/print.sh @@ -1,19 +1,7 @@ #!/bin/bash # -# Copyright (C) 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 -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# SPDX-FileCopyrightText: 2020 Michael Jeanson +# SPDX-License-Identifier: GPL-2.0-or-later set -exu diff --git a/scripts/librseq/build.sh b/scripts/librseq/build.sh index 95b770e..981f30f 100755 --- a/scripts/librseq/build.sh +++ b/scripts/librseq/build.sh @@ -1,20 +1,8 @@ #!/bin/bash # -# Copyright (C) 2015 Jonathan Rajotte-Julien -# Copyright (C) 2019-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 -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# SPDX-FileCopyrightText: 2015 Jonathan Rajotte-Julien +# SPDX-FileCopyrightText: 2016-2023 Michael Jeanson +# SPDX-License-Identifier: GPL-2.0-or-later set -exu @@ -25,6 +13,8 @@ vercomp () { return 0 fi local IFS=. + # Ignore the shellcheck warning, we want splitting to happen based on IFS. + # shellcheck disable=SC2206 local i ver1=($1) ver2=($2) # fill empty fields in ver1 with zeros for ((i=${#ver1[@]}; i<${#ver2[@]}; i++)); do @@ -71,28 +61,74 @@ verne() { [ "$res" -ne "0" ] } +print_header() { + set +x + + local message=" $1 " + local message_len + local padding_len + + message_len="${#message}" + padding_len=$(( (80 - (message_len)) / 2 )) + + printf '\n'; printf -- '#%.0s' {1..80}; printf '\n' + printf -- '-%.0s' {1..80}; printf '\n' + printf -- '#%.0s' $(seq 1 $padding_len); printf '%s' "$message"; printf -- '#%.0s' $(seq 1 $padding_len); printf '\n' + printf -- '-%.0s' {1..80}; printf '\n' + printf -- '#%.0s' {1..80}; printf '\n\n' + + set -x +} + failed_configure() { # Assume we are in the configured build directory - echo "#################### BEGIN config.log ####################" + print_header "BEGIN config.log" cat config.log - echo "#################### END config.log ####################" + print_header "END config.log" # End the build with failure exit 1 } +print_header "Librseq build script starting" + # Required variables WORKSPACE=${WORKSPACE:-} +# Axis platform=${platform:-} conf=${conf:-} build=${build:-} cc=${cc:-} +# Build steps that can be overriden by the environment +LIBRSEQ_MAKE_INSTALL="${LIBRSEQ_MAKE_INSTALL:-yes}" +LIBRSEQ_MAKE_CLEAN="${LIBRSEQ_MAKE_CLEAN:-yes}" +LIBRSEQ_GEN_COMPILE_COMMANDS="${LIBRSEQ_GEN_COMPILE_COMMANDS:-no}" +LIBRSEQ_RUN_TESTS="${LIBRSEQ_RUN_TESTS:-yes}" SRCDIR="$WORKSPACE/src/librseq" TMPDIR="$WORKSPACE/tmp" PREFIX="/build" +LIBDIR="lib" +LIBDIR_ARCH="$LIBDIR" + +# RHEL and SLES both use lib64 but don't bother shipping a default autoconf +# site config that matches this. +if [[ ( -f /etc/redhat-release || -f /etc/products.d/SLES.prod || -f /etc/yocto-release ) ]]; then + # Detect the userspace bitness in a distro agnostic way + if file -L /bin/bash | grep '64-bit' >/dev/null 2>&1; then + LIBDIR_ARCH="${LIBDIR}64" + fi +fi + +exit_status=0 + +# Use bear to generate compile_commands.json when enabled +BEAR="" +if [ "$LIBRSEQ_GEN_COMPILE_COMMANDS" = "yes" ]; then + BEAR="bear" +fi # Create tmp directory rm -rf "$TMPDIR" @@ -100,6 +136,7 @@ mkdir -p "$TMPDIR" export TMPDIR export CFLAGS="-g -O2" +export CXXFLAGS="-g -O2" # Add the convenience headers in extra to the # include path. @@ -130,11 +167,6 @@ clang-*) ;; esac -if [ "x${CC:-}" != "x" ]; then - echo "Selected compiler:" - "$CC" -v -fi - # Set platform variables case "$platform" in *) @@ -147,6 +179,7 @@ case "$platform" in esac # Print build env details +print_header "Build environment details" print_os || true print_tooling || true @@ -154,25 +187,25 @@ print_tooling || true cd "$SRCDIR" # Run bootstrap in the source directory prior to configure +print_header "Bootstrap autotools" ./bootstrap # Get source version from configure script eval "$(grep '^PACKAGE_VERSION=' ./configure)" PACKAGE_VERSION=${PACKAGE_VERSION//\-pre*/} - # Set configure options and environment variables for each build # configuration. -CONF_OPTS=("--prefix=$PREFIX") +CONF_OPTS=("--prefix=$PREFIX" "--libdir=$PREFIX/$LIBDIR_ARCH" "--disable-maintainer-mode") case "$conf" in static) - echo "Static lib only configuration" + print_header "Conf: Static lib only" CONF_OPTS+=("--enable-static" "--disable-shared") ;; *) - echo "Standard configuration" + print_header "Conf: Standard" ;; esac @@ -186,7 +219,7 @@ esac # before continuing. case "$build" in oot) - echo "Out of tree build" + print_header "Build: Out of tree" # Create and enter a temporary build directory builddir=$(mktemp -d) @@ -196,7 +229,7 @@ oot) ;; dist) - echo "Distribution in-tree build" + print_header "Build: Distribution In-tree" # Run configure and generate the tar file # in the source directory @@ -216,7 +249,7 @@ dist) ;; oot-dist) - echo "Distribution out of tree build" + print_header "Build: Distribution Out of tree" # Create and enter a temporary build directory builddir=$(mktemp -d) @@ -243,7 +276,8 @@ oot-dist) ;; *) - echo "Standard in-tree build" + print_header "Build: Standard In-tree" + ./configure "${CONF_OPTS[@]}" || failed_configure ;; esac @@ -251,34 +285,47 @@ esac # We are now inside a configured build directory # BUILD! -$MAKE -j "$($NPROC)" V=1 +print_header "BUILD!" +$BEAR ${BEAR:+--} $MAKE -j "$($NPROC)" V=1 -# Install in the workspace -$MAKE install DESTDIR="$WORKSPACE" +# Install in the workspace if enabled +if [ "$LIBRSEQ_MAKE_INSTALL" = "yes" ]; then + print_header "Install" -# Run tests, don't fail now, we want to run the archiving steps -set +e -$MAKE --keep-going check -ret=$? -set -e + $MAKE install V=1 DESTDIR="$WORKSPACE" -# 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" + # Cleanup rpath in executables and shared libraries + #find "$WORKSPACE/$PREFIX/bin" -type f -perm -0500 -exec chrpath --delete {} \; + find "$WORKSPACE/$PREFIX/$LIBDIR_ARCH" -name "*.so" -exec chrpath --delete {} \; -# Copy the test suites top-level log which includes all tests failures -rsync -a --include 'test-suite.log' --include '*/' --exclude='*' tests/ "$WORKSPACE/log" + # Remove libtool .la files + find "$WORKSPACE/$PREFIX/$LIBDIR_ARCH" -name "*.la" -delete +fi -# Clean the build directory -$MAKE clean +# Run tests if enabled +if [ "$LIBRSEQ_RUN_TESTS" = "yes" ]; then + print_header "Run test suite" -# Cleanup rpath in executables and shared libraries -#find "$WORKSPACE/$PREFIX/bin" -type f -perm -0500 -exec chrpath --delete {} \; -find "$WORKSPACE/$PREFIX/lib" -name "*.so" -exec chrpath --delete {} \; + # Run tests, don't fail now, we want to run the archiving steps + $MAKE --keep-going check || exit_status=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" + + # Copy the test suites top-level log which includes all tests failures + rsync -a --include 'test-suite.log' --include '*/' --exclude='*' tests/ "$WORKSPACE/log" +fi + +# Clean the build directory +if [ "$LIBRSEQ_MAKE_CLEAN" = "yes" ]; then + print_header "Clean" + $MAKE clean +fi -# Remove libtool .la files -find "$WORKSPACE/$PREFIX/lib" -name "*.la" -exec rm -f {} \; +print_header "Librseq build script ended with: $(test $exit_status == 0 && echo SUCCESS || echo FAILURE)" -# Exit with the return code of the test suite -exit $ret +# Exit with failure if any of the tests failed +exit $exit_status # EOF +# vim: expandtab tabstop=4 shiftwidth=4 diff --git a/scripts/liburcu/build.sh b/scripts/liburcu/build.sh index c8f0c73..b1dcb01 100755 --- a/scripts/liburcu/build.sh +++ b/scripts/liburcu/build.sh @@ -1,20 +1,8 @@ #!/bin/bash # -# Copyright (C) 2015 Jonathan Rajotte-Julien -# 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 -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# SPDX-FileCopyrightText: 2015 Jonathan Rajotte-Julien +# SPDX-FileCopyrightText: 2016-2023 Michael Jeanson +# SPDX-License-Identifier: GPL-2.0-or-later set -exu @@ -73,26 +61,52 @@ verne() { [ "$res" -ne "0" ] } +print_header() { + set +x + + local message=" $1 " + local message_len + local padding_len + + message_len="${#message}" + padding_len=$(( (80 - (message_len)) / 2 )) + + printf '\n'; printf -- '#%.0s' {1..80}; printf '\n' + printf -- '-%.0s' {1..80}; printf '\n' + printf -- '#%.0s' $(seq 1 $padding_len); printf '%s' "$message"; printf -- '#%.0s' $(seq 1 $padding_len); printf '\n' + printf -- '-%.0s' {1..80}; printf '\n' + printf -- '#%.0s' {1..80}; printf '\n\n' + + set -x +} + failed_configure() { # Assume we are in the configured build directory - echo "#################### BEGIN config.log ####################" + print_header "BEGIN config.log" cat config.log - echo "#################### END config.log ####################" + print_header "END config.log" # End the build with failure exit 1 } +print_header "Liburcu build script starting" + # Required variables WORKSPACE=${WORKSPACE:-} +# Axis platform=${platform:-} conf=${conf:-} build=${build:-} cc=${cc:-} -# Controls if the tests are run -USERSPACE_RCU_RUN_TESTS="${USERSPACE_RCU_RUN_TESTS:=yes}" +# Build steps that can be overriden by the environment +USERSPACE_RCU_MAKE_INSTALL="${USERSPACE_RCU_MAKE_INSTALL:-yes}" +USERSPACE_RCU_MAKE_CLEAN="${USERSPACE_RCU_MAKE_CLEAN:-yes}" +USERSPACE_RCU_GEN_COMPILE_COMMANDS="${USERSPACE_RCU_GEN_COMPILE_COMMANDS:-no}" +USERSPACE_RCU_RUN_TESTS="${USERSPACE_RCU_RUN_TESTS:-yes}" +USERSPACE_RCU_CLANG_TIDY="${USERSPACE_RCU_CLANG_TIDY:-no}" SRCDIR="$WORKSPACE/src/liburcu" TMPDIR="$WORKSPACE/tmp" @@ -109,12 +123,21 @@ if [[ ( -f /etc/redhat-release || -f /etc/products.d/SLES.prod || -f /etc/yocto- fi fi +exit_status=0 + +# Use bear to generate compile_commands.json when enabled +BEAR="" +if [ "$USERSPACE_RCU_GEN_COMPILE_COMMANDS" = "yes" ]; then + BEAR="bear" +fi + # Create tmp directory rm -rf "$TMPDIR" mkdir -p "$TMPDIR" export TMPDIR export CFLAGS="-g -O2" +export CXXFLAGS="-g -O2" # Set compiler variables case "$cc" in @@ -141,11 +164,6 @@ clang-*) ;; esac -if [ "x${CC:-}" != "x" ]; then - echo "Selected compiler:" - "$CC" -v -fi - # Set platform variables case "$platform" in macos*) @@ -179,6 +197,7 @@ freebsd*) esac # Print build env details +print_header "Build environment details" print_os || true print_tooling || true @@ -186,6 +205,7 @@ print_tooling || true cd "$SRCDIR" # Run bootstrap in the source directory prior to configure +print_header "Bootstrap autotools" ./bootstrap # Get source version from configure script @@ -194,21 +214,23 @@ PACKAGE_VERSION=${PACKAGE_VERSION//\-pre*/} # Set configure options and environment variables for each build # configuration. -CONF_OPTS=("--prefix=$PREFIX" "--libdir=$PREFIX/$LIBDIR_ARCH") +CONF_OPTS=("--prefix=$PREFIX" "--libdir=$PREFIX/$LIBDIR_ARCH" "--disable-maintainer-mode") case "$conf" in static) - echo "Static lib only configuration" + print_header "Conf: Static lib only" CONF_OPTS+=("--enable-static" "--disable-shared") ;; tls_fallback) - echo "Using pthread_getspecific() to emulate TLS" + print_header "Conf: Use pthread_getspecific() to emulate TLS" + CONF_OPTS+=("--disable-compiler-tls") ;; debug-rcu) - echo "Enable RCU sanity checks for debugging" + print_header "Conf: Enable RCU sanity checks for debugging" + if vergte "$PACKAGE_VERSION" "0.10"; then CONF_OPTS+=("--enable-rcu-debug") else @@ -222,7 +244,7 @@ debug-rcu) ;; *) - echo "Standard configuration" + print_header "Conf: Standard" ;; esac @@ -236,7 +258,7 @@ esac # before continuing. case "$build" in oot) - echo "Out of tree build" + print_header "Build: Out of tree" # Create and enter a temporary build directory builddir=$(mktemp -d) @@ -246,7 +268,7 @@ oot) ;; dist) - echo "Distribution in-tree build" + print_header "Build: Distribution In-tree" # Run configure and generate the tar file # in the source directory @@ -266,7 +288,7 @@ dist) ;; oot-dist) - echo "Distribution out of tree build" + print_header "Build: Distribution Out of tree" # Create and enter a temporary build directory builddir=$(mktemp -d) @@ -293,7 +315,8 @@ oot-dist) ;; *) - echo "Standard in-tree build" + print_header "Build: Standard In-tree" + ./configure "${CONF_OPTS[@]}" || failed_configure ;; esac @@ -301,18 +324,62 @@ esac # We are now inside a configured build directory # BUILD! -$MAKE -j "$($NPROC)" V=1 +print_header "BUILD!" +$BEAR ${BEAR:+--} $MAKE -j "$($NPROC)" V=1 + +# Install in the workspace if enabled +if [ "$USERSPACE_RCU_MAKE_INSTALL" = "yes" ]; then + print_header "Install" + + $MAKE install V=1 DESTDIR="$WORKSPACE" + + # Cleanup rpath in executables and shared libraries + #find "$WORKSPACE/$PREFIX/bin" -type f -perm -0500 -exec chrpath --delete {} \; + find "$WORKSPACE/$PREFIX/$LIBDIR_ARCH" -name "*.so" -exec chrpath --delete {} \; + + # Remove libtool .la files + find "$WORKSPACE/$PREFIX/$LIBDIR_ARCH" -name "*.la" -delete +fi + +# Run clang-tidy on the topmost commit +if [ "$USERSPACE_RCU_CLANG_TIDY" = "yes" ]; then + print_header "Run clang-tidy" -# Install in the workspace -$MAKE install DESTDIR="$WORKSPACE" + # This would be better by linting only the lines touched by a patch but it + # doesn't seem to work, the lines are always filtered and no error is + # reported. + #git diff -U0 HEAD^ | clang-tidy-diff -p1 -j "$($NPROC)" -timeout 60 -fix -# Run tests, don't fail now, we want to run the archiving steps -failed_tests=0 + # Instead, run clan-tidy on all the files touched by the patch. + while read -r filepath; do + if [[ "$filepath" =~ (\.cpp|\.hhp|\.c|\.h)$ ]]; then + clang-tidy --fix-errors "$(realpath "$filepath")" + fi + done < <(git diff-tree --no-commit-id --diff-filter=d --name-only -r HEAD) + + # If the tree has local changes, the formatting was incorrect + GIT_DIFF_OUTPUT=$(git diff) + if [ -n "$GIT_DIFF_OUTPUT" ]; then + echo "Saving clang-tidy proposed fixes in clang-tidy-fixes.diff" + git diff > "$WORKSPACE/clang-tidy-fixes.diff" + + # Restore the unfixed files so they can be viewed in the warnings web + # interface + git checkout . + exit_status=1 + fi +fi + +# Run tests if enabled if [ "$USERSPACE_RCU_RUN_TESTS" = "yes" ]; then - $MAKE --keep-going check || failed_tests=1 + print_header "Run test suite" + + # Run tests, don't fail now, we want to run the archiving steps + $MAKE --keep-going check || exit_status=1 + # Only run regtest for 0.9 and up if vergte "$PACKAGE_VERSION" "0.9"; then - $MAKE --keep-going regtest || failed_tests=1 + $MAKE --keep-going regtest || exit_status=1 fi # Copy tap logs for the jenkins tap parser before cleaning the build dir @@ -330,16 +397,15 @@ if [ "$USERSPACE_RCU_RUN_TESTS" = "yes" ]; then fi # Clean the build directory -$MAKE clean - -# Cleanup rpath in executables and shared libraries -#find "$WORKSPACE/$PREFIX/bin" -type f -perm -0500 -exec chrpath --delete {} \; -find "$WORKSPACE/$PREFIX/$LIBDIR_ARCH" -name "*.so" -exec chrpath --delete {} \; +if [ "$USERSPACE_RCU_MAKE_CLEAN" = "yes" ]; then + print_header "Clean" + $MAKE clean +fi -# Remove libtool .la files -find "$WORKSPACE/$PREFIX/$LIBDIR_ARCH" -name "*.la" -exec rm -f {} \; +print_header "Liburcu build script ended with: $(test $exit_status == 0 && echo SUCCESS || echo FAILURE)" # Exit with failure if any of the tests failed -exit $failed_tests +exit $exit_status # EOF +# vim: expandtab tabstop=4 shiftwidth=4 diff --git a/scripts/lttng-tools/build.sh b/scripts/lttng-tools/build.sh index 8562d1e..8542adc 100755 --- a/scripts/lttng-tools/build.sh +++ b/scripts/lttng-tools/build.sh @@ -217,11 +217,6 @@ clang-*) ;; esac -if [ "x${CC:-}" != "x" ]; then - echo "Selected compiler:" - "$CC" -v -fi - # Set platform variables case "$platform" in macos*) @@ -321,6 +316,7 @@ static) no-ust) print_header "Conf: Without UST support" + CONF_OPTS+=("--without-lttng-ust") DIST_CONF_OPTS+=("--without-lttng-ust") ;; @@ -544,7 +540,9 @@ if [ "$LTTNG_TOOLS_RUN_TESTS" = "yes" ] && [ "$conf" != "no-ust" ]; then prove --merge -v --exec '' - < long_regression --archive "$TAPDIR/long_regression/" || exit_status=1 cd .. fi -else +fi + +if [ "$LTTNG_TOOLS_RUN_TESTS" = "yes" ] && [ "$conf" = "no-ust" ]; then # The TAP plugin will fail the job if no test logs are present mkdir -p "$TAPDIR/no-tests" echo "1..1" > "$TAPDIR/no-tests/tests.log" diff --git a/scripts/lttng-ust/build.sh b/scripts/lttng-ust/build.sh index 230c4d5..625b285 100755 --- a/scripts/lttng-ust/build.sh +++ b/scripts/lttng-ust/build.sh @@ -1,20 +1,8 @@ #!/bin/bash # -# Copyright (C) 2015 Jonathan Rajotte-Julien -# 2016-2019 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 -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# SPDX-FileCopyrightText: 2015 Jonathan Rajotte-Julien +# SPDX-FileCopyrightText: 2016-2023 Michael Jeanson +# SPDX-License-Identifier: GPL-2.0-or-later set -exu @@ -73,26 +61,52 @@ verne() { [ "$res" -ne "0" ] } +print_header() { + set +x + + local message=" $1 " + local message_len + local padding_len + + message_len="${#message}" + padding_len=$(( (80 - (message_len)) / 2 )) + + printf '\n'; printf -- '#%.0s' {1..80}; printf '\n' + printf -- '-%.0s' {1..80}; printf '\n' + printf -- '#%.0s' $(seq 1 $padding_len); printf '%s' "$message"; printf -- '#%.0s' $(seq 1 $padding_len); printf '\n' + printf -- '-%.0s' {1..80}; printf '\n' + printf -- '#%.0s' {1..80}; printf '\n\n' + + set -x +} + failed_configure() { # Assume we are in the configured build directory - echo "#################### BEGIN config.log ####################" + print_header "BEGIN config.log" cat config.log - echo "#################### END config.log ####################" + print_header "END config.log" # End the build with failure exit 1 } +print_header "LTTng-UST build script starting" + # Required variables WORKSPACE=${WORKSPACE:-} +# Axis platform=${platform:-} conf=${conf:-} build=${build:-} cc=${cc:-} -# Controls if the tests are run -LTTNG_UST_RUN_TESTS="${LTTNG_UST_RUN_TESTS:=yes}" +# Build steps that can be overriden by the environment +LTTNG_UST_MAKE_INSTALL="${LTTNG_UST_MAKE_INSTALL:-yes}" +LTTNG_UST_MAKE_CLEAN="${LTTNG_UST_MAKE_CLEAN:-yes}" +LTTNG_UST_GEN_COMPILE_COMMANDS="${LTTNG_UST_GEN_COMPILE_COMMANDS:-no}" +LTTNG_UST_RUN_TESTS="${LTTNG_UST_RUN_TESTS:-yes}" +LTTNG_UST_CLANG_TIDY="${LTTNG_UST_CLANG_TIDY:-no}" SRCDIR="$WORKSPACE/src/lttng-ust" TMPDIR="$WORKSPACE/tmp" @@ -120,12 +134,21 @@ export PKG_CONFIG_PATH="$DEPS_PKGCONFIG" export CPPFLAGS="-I$DEPS_INC" export LDFLAGS="-L$DEPS_LIB" +exit_status=0 + +# Use bear to generate compile_commands.json when enabled +BEAR="" +if [ "$LTTNG_UST_GEN_COMPILE_COMMANDS" = "yes" ]; then + BEAR="bear" +fi + # Create tmp directory rm -rf "$TMPDIR" mkdir -p "$TMPDIR" export TMPDIR export CFLAGS="-g -O2" +export CXXFLAGS="-g -O2" # Set compiler variables case "$cc" in @@ -152,11 +175,6 @@ clang-*) ;; esac -if [ "x${CC:-}" != "x" ]; then - echo "Selected compiler:" - "$CC" -v -fi - # Set platform variables case "$platform" in freebsd*) @@ -182,6 +200,7 @@ freebsd*) esac # Print build env details +print_header "Build environment details" print_os || true print_tooling || true @@ -189,6 +208,7 @@ print_tooling || true cd "$SRCDIR" # Run bootstrap in the source directory prior to configure +print_header "Bootstrap autotools" ./bootstrap # Get source version from configure script @@ -197,10 +217,10 @@ PACKAGE_VERSION=${PACKAGE_VERSION//\-pre*/} # Set configure options and environment variables for each build # configuration. -CONF_OPTS=("--prefix=$PREFIX" "--libdir=$PREFIX/$LIBDIR_ARCH") +CONF_OPTS=("--prefix=$PREFIX" "--libdir=$PREFIX/$LIBDIR_ARCH" "--disable-maintainer-mode") case "$conf" in static) - echo "Static lib only configuration" + print_header "Conf: Static lib only" CONF_OPTS+=("--enable-static" "--disable-shared") @@ -209,7 +229,7 @@ static) ;; agents) - echo "Java and Python agents configuration" + print_header "Conf: Java and Python agents" CONF_OPTS+=("--enable-java-agent-all" "--enable-jni-interface" "--enable-python-agent") @@ -220,12 +240,13 @@ agents) ;; debug-rcu) - echo "Enable RCU sanity checks for debugging" + print_header "Conf: Enable RCU sanity checks for debugging" + export CPPFLAGS="${CPPFLAGS} -DDEBUG_RCU" ;; *) - echo "Standard configuration" + print_header "Conf: Standard" # Something is broken in docbook-xml on yocto if [[ "$platform" = yocto* ]]; then @@ -244,7 +265,7 @@ esac # before continuing. case "$build" in oot) - echo "Out of tree build" + print_header "Build: Out of tree" # Create and enter a temporary build directory builddir=$(mktemp -d) @@ -254,7 +275,7 @@ oot) ;; dist) - echo "Distribution in-tree build" + print_header "Build: Distribution In-tree" # Run configure and generate the tar file # in the source directory @@ -274,7 +295,7 @@ dist) ;; oot-dist) - echo "Distribution out of tree build" + print_header "Build: Distribution Out of tree" # Create and enter a temporary build directory builddir=$(mktemp -d) @@ -301,7 +322,8 @@ oot-dist) ;; *) - echo "Standard in-tree build" + print_header "Build: Standard In-tree" + ./configure "${CONF_OPTS[@]}" || failed_configure ;; esac @@ -309,41 +331,74 @@ esac # We are now inside a configured build directory # BUILD! -$MAKE -j "$($NPROC)" V=1 +print_header "BUILD!" +$BEAR ${BEAR:+--} $MAKE -j "$($NPROC)" V=1 + +# Install in the workspace if enabled +if [ "$LTTNG_UST_MAKE_INSTALL" = "yes" ]; then + print_header "Install" + + $MAKE install V=1 DESTDIR="$WORKSPACE" + + # Cleanup rpath in executables and shared libraries + #find "$WORKSPACE/$PREFIX/bin" -type f -perm -0500 -exec chrpath --delete {} \; + find "$WORKSPACE/$PREFIX/$LIBDIR_ARCH" -name "*.so" -exec chrpath --delete {} \; + + # Remove libtool .la files + find "$WORKSPACE/$PREFIX/$LIBDIR_ARCH" -name "*.la" -delete +fi + +# Run clang-tidy on the topmost commit +if [ "$LTTNG_UST_CLANG_TIDY" = "yes" ]; then + print_header "Run clang-tidy" -# Install in the workspace -$MAKE install DESTDIR="$WORKSPACE" + # This would be better by linting only the lines touched by a patch but it + # doesn't seem to work, the lines are always filtered and no error is + # reported. + #git diff -U0 HEAD^ | clang-tidy-diff -p1 -j "$($NPROC)" -timeout 60 -fix + + # Instead, run clan-tidy on all the files touched by the patch. + while read -r filepath; do + if [[ "$filepath" =~ (\.cpp|\.hhp|\.c|\.h)$ ]]; then + clang-tidy --fix-errors "$(realpath "$filepath")" + fi + done < <(git diff-tree --no-commit-id --diff-filter=d --name-only -r HEAD) + + # If the tree has local changes, the formatting was incorrect + GIT_DIFF_OUTPUT=$(git diff) + if [ -n "$GIT_DIFF_OUTPUT" ]; then + echo "Saving clang-tidy proposed fixes in clang-tidy-fixes.diff" + git diff > "$WORKSPACE/clang-tidy-fixes.diff" + + # Restore the unfixed files so they can be viewed in the warnings web + # interface + git checkout . + exit_status=1 + fi +fi # Run tests, don't fail now, we want to run the archiving steps -failed_tests=0 if [ "$LTTNG_UST_RUN_TESTS" = "yes" ]; then - $MAKE --keep-going check || failed_tests=1 + $MAKE --keep-going check || exit_status=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" # Copy the test suites top-level log which includes all tests failures rsync -a --include 'test-suite.log' --include '*/' --exclude='*' tests/ "$WORKSPACE/log" - - # The test suite prior to 2.8 did not produce TAP logs - if verlt "$PACKAGE_VERSION" "2.8"; 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 +if [ "$LTTNG_UST_MAKE_CLEAN" = "yes" ]; then + print_header "Clean" -# Cleanup rpath in executables and shared libraries -#find "$WORKSPACE/$PREFIX/bin" -type f -perm -0500 -exec chrpath --delete {} \; -find "$WORKSPACE/$PREFIX/$LIBDIR_ARCH" -name "*.so" -exec chrpath --delete {} \; + $MAKE clean +fi -# Remove libtool .la files -find "$WORKSPACE/$PREFIX/$LIBDIR_ARCH" -name "*.la" -exec rm -f {} \; +print_header "LTTng-UST build script ended with: $(test $exit_status == 0 && echo SUCCESS || echo FAILURE)" # Exit with failure if any of the tests failed -exit $failed_tests +exit $exit_status # EOF +# vim: expandtab tabstop=4 shiftwidth=4 -- 2.34.1