From d6237b1bb90d2e5afedc55b77b1fa52f5506f260 Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson@efficios.com>
Date: Mon, 1 May 2023 14:49:19 -0400
Subject: [PATCH] jjb: lttng-tools: fix no-ust configs

Don't set 'LTTNG_TOOLS_RUN_TESTS=no' on platforms without ust, they
already use the 'no-ust' config to handle that.

Change-Id: Ib12c492287a94ea78ac1fdf280a23e0245b829b3
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
---
 scripts/lttng-tools/build.sh | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/scripts/lttng-tools/build.sh b/scripts/lttng-tools/build.sh
index 8542adc..243e647 100755
--- a/scripts/lttng-tools/build.sh
+++ b/scripts/lttng-tools/build.sh
@@ -228,18 +228,12 @@ macos*)
     export LDFLAGS="-L/opt/local/lib $LDFLAGS"
     export PYTHON="python3"
     export PYTHON_CONFIG="python3-config"
-
-    LTTNG_TOOLS_RUN_TESTS="no"
-    LTTNG_TOOLS_RUN_TESTS_LONG_REGRESSION="no"
     ;;
 
 cygwin|cygwin64|msys32|msys64)
     export MAKE=make
     export TAR=tar
     export NPROC=nproc
-
-    LTTNG_TOOLS_RUN_TESTS="no"
-    LTTNG_TOOLS_RUN_TESTS_LONG_REGRESSION="no"
     ;;
 
 *)
@@ -494,8 +488,8 @@ if [ "$LTTNG_TOOLS_CLANG_TIDY" = "yes" ]; then
     fi
 fi
 
-# Run tests for all configs except 'no-ust'
-if [ "$LTTNG_TOOLS_RUN_TESTS" = "yes" ] && [ "$conf" != "no-ust" ]; then
+# Run tests for all configs except 'no-ust' / 'relayd-only'
+if [ "$LTTNG_TOOLS_RUN_TESTS" = "yes" ] && [[ ! "$conf" =~ (no-ust|relayd-only) ]]; then
     print_header "Run test suite"
 
     # Allow core dumps
@@ -542,7 +536,7 @@ if [ "$LTTNG_TOOLS_RUN_TESTS" = "yes" ] && [ "$conf" != "no-ust" ]; then
     fi
 fi
 
-if [ "$LTTNG_TOOLS_RUN_TESTS" = "yes" ] && [ "$conf" = "no-ust" ]; then
+if [ "$LTTNG_TOOLS_RUN_TESTS" = "yes" ] && [[ "$conf" =~ (no-ust|relayd-only) ]]; 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"
-- 
2.34.1