From 0b93ba404150839c81cd046cf6ad35951fa01eb1 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Mon, 25 Jul 2022 15:13:57 -0400 Subject: [PATCH] jjb: lttng-ust: fix gerrit FreeBSD build for < stable-2.13 FreeBSD support was introduced in lttng-ust 2.13, however the gerrit job can build any versions. Detect unsupported versions and exit sucessfuly. Change-Id: Id7b08c203a4585d6a24147ad6fb547dae18b4619 Signed-off-by: Michael Jeanson --- scripts/lttng-ust/build.sh | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/scripts/lttng-ust/build.sh b/scripts/lttng-ust/build.sh index 5f960b4..7341b0c 100755 --- a/scripts/lttng-ust/build.sh +++ b/scripts/lttng-ust/build.sh @@ -182,6 +182,15 @@ cd "$SRCDIR" eval "$(grep '^PACKAGE_VERSION=' ./configure)" PACKAGE_VERSION=${PACKAGE_VERSION//\-pre*/} +# Gerrit will trigger build on FreeBSD regardless of the branch, exit +# successfuly when the version is < 2.13. +if [[ $arch == freebsd* ]] && verlt "$PACKAGE_VERSION" "2.13"; then + mkdir -p "$WORKSPACE/tap/no-log" + echo "1..1" > "$WORKSPACE/tap/no-log/tests.log" + echo "ok 1 - FreeBSD build unsupported in < 2.13" >> "$WORKSPACE/tap/no-log/tests.log" + exit 0 +fi + # Set configure options and environment variables for each build # configuration. CONF_OPTS=("--prefix=$PREFIX") @@ -240,7 +249,7 @@ dist) # Run configure and generate the tar file # in the source directory - ./configure || failed_configure + ./configure --enable-jni-interface || failed_configure $MAKE dist # Create and enter a temporary build directory @@ -263,7 +272,7 @@ oot-dist) cd "$builddir" # Run configure out of tree and generate the tar file - "$SRCDIR/configure" || failed_configure + "$SRCDIR/configure" --enable-jni-interface || failed_configure $MAKE dist dist_srcdir="$(mktemp -d)" -- 2.34.1