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>
export LDFLAGS="-L/opt/local/lib $LDFLAGS"
export PYTHON="python3"
export PYTHON_CONFIG="python3-config"
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
;;
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"
-# 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
print_header "Run test suite"
# Allow core dumps
-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"
# 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"