From 481eadc8ea5acbb527b707e50884e2bab37c2c69 Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Thu, 29 Aug 2019 15:02:09 -0400 Subject: [PATCH] lttng-tools: add babeltrace master as a babeltrace value Signed-off-by: Jonathan Rajotte --- jobs/lttng-tools.yaml | 2 +- scripts/lttng-tools/build.sh | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml index 8b9aea9..cac846b 100644 --- a/jobs/lttng-tools.yaml +++ b/jobs/lttng-tools.yaml @@ -649,7 +649,7 @@ build: !!python/tuple [std, oot, dist] conf: !!python/tuple [std, no-ust, agents, debug-rcu] urcuversion: !!python/tuple [master] - babelversion: !!python/tuple [stable-1.5] + babelversion: !!python/tuple [stable-1.5, master] testtype: !!python/tuple [base] - 'lttng-tools_{version}_{buildtype}': buildtype: portbuild diff --git a/scripts/lttng-tools/build.sh b/scripts/lttng-tools/build.sh index afa8b8c..9f6bc71 100755 --- a/scripts/lttng-tools/build.sh +++ b/scripts/lttng-tools/build.sh @@ -105,6 +105,19 @@ tmpdir="$(mktemp)" ln -sf "$TMPDIR" "$tmpdir" export TMPDIR="$tmpdir" +# Create a symlink to "babeltrace" when the "babeltrace2" executable is found. +# This is a temporary workaround until lttng-tools either allows the override of +# the trace reader in its test suite or that we move to only supporting +# babeltrace2 +if [ -x "$DEPS_BIN/babeltrace2" ]; then + ln -s "$DEPS_BIN/babeltrace2" "$DEPS_BIN/babeltrace" +fi + +# When using babeltrace2 make sure that it finds its plugins and +# plugin-providers. +export BABELTRACE_PLUGIN_PATH="$DEPS_LIB/babeltrace2/plugins/" +export LIBBABELTRACE2_PLUGIN_PROVIDER_DIR="$DEPS_LIB/babeltrace2/plugin-providers/" + export CFLAGS="-g -O2" # Set compiler variables -- 2.34.1