From fdd628f52ab3bdbb21b4b486bcdeb9158ecc1708 Mon Sep 17 00:00:00 2001
From: Florian Fischer <florian.fl.fischer@fau.de>
Date: Sun, 29 Nov 2020 23:25:59 +0100
Subject: [PATCH] [gitlab-ci] add test with enabled userspace rcu support
---
.gitlab-ci.yml | 9 +++++++++
meson.build | 2 +-
meson_options.txt | 2 +-
3 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b630549a..656454b4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -58,6 +58,10 @@ variables:
variables:
EMPER_WORKER_STATS: 'true'
+.emper-userspace-rcu:
+ variables:
+ EMPER_USERSPACE_RCU: 'true'
+
.release-build:
variables:
BUILDTYPE: release
@@ -105,3 +109,8 @@ test-with-stats:
extends:
- .test
- .emper-worker-stats
+
+test-with-userspace-rcu:
+ extends:
+ - .test
+ - .emper-userspace-rcu
diff --git a/meson.build b/meson.build
index 7e7331d0..4bda5563 100644
--- a/meson.build
+++ b/meson.build
@@ -18,7 +18,7 @@ run_target('iwyu',
command: 'tools/check-iwyu')
conf_data = configuration_data()
-option_urcu = get_option('userspace-rcu')
+option_urcu = get_option('userspace_rcu')
conf_data.set('EMPER_LIBURCU', option_urcu)
if option_urcu
liburcu_dep = dependency('liburcu')
diff --git a/meson_options.txt b/meson_options.txt
index 98390462..5f283147 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,5 +1,5 @@
option(
- 'userspace-rcu',
+ 'userspace_rcu',
type: 'boolean',
value: false,
description: 'Allow EMPER fibers to use userspace RCU',
--
GitLab