From f1d85a63f3cc5595dfa590c44e9d1510da3143ae Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Tue, 22 Jun 2021 10:57:46 -0400 Subject: [PATCH] Fix: system-tests: canary 2.10 lttng-ust with urcu >= 0.13 is not supported urcu 0.13 removes the urcu_bp_synchronize_rcu symbols leading to detection problem at configure time. [1] https://github.com/lttng/lttng-ust/commit/b94384c0525ff159b7605c8010c8543388f3e71d The canary is not updated to version 2.11 yet since the above fix is not yet part of an official release. Signed-off-by: Jonathan Rajotte --- scripts/system-tests/lava2-submit.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/system-tests/lava2-submit.py b/scripts/system-tests/lava2-submit.py index 7a9ed23..dec07a9 100644 --- a/scripts/system-tests/lava2-submit.py +++ b/scripts/system-tests/lava2-submit.py @@ -127,10 +127,15 @@ def get_vlttng_cmd( """ Return vlttng cmd to be used in the job template for setup. """ + urcu_profile = "" + if lttng_version == 'master' or (major_version >= 2 and minor_version >= 11): + urcu_profile = "urcu-master" + else: + urcu_profile = "urcu-stable-0.12" vlttng_cmd = ( - 'vlttng --jobs=$(nproc) --profile urcu-master' - ' --override projects.babeltrace.build-env.PYTHON=python3' + 'vlttng --jobs=$(nproc) --profile ' + urcu_profile + + ' --override projects.babeltrace.build-env.PYTHON=python3' ' --override projects.babeltrace.build-env.PYTHON_CONFIG=python3-config' ' --profile babeltrace-stable-1.5' ' --profile babeltrace-python' -- 2.34.1