From 280938482634db65169c59109b2c35aaaf925d3b Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Mon, 19 Dec 2022 08:42:36 +0100
Subject: [PATCH] [ci] Check for xvfb-run existance and add ctest exclude
regex.
---
scripts/ci/extends/template-build-linux.yml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/scripts/ci/extends/template-build-linux.yml b/scripts/ci/extends/template-build-linux.yml
index 8ce8e851798..9e1f395d1e7 100644
--- a/scripts/ci/extends/template-build-linux.yml
+++ b/scripts/ci/extends/template-build-linux.yml
@@ -41,7 +41,7 @@
xvfb_run_cmd=""
if [[ "$OSTYPE" == "darwin"* ]]; then
alias date=gdate
- else
+ elif command -v xvfb-run &> /dev/null ; then
xvfb_run_cmd="xvfb-run -a"
fi
@@ -49,6 +49,9 @@
if [[ ! -z "$CTEST_INCLUDE_REGEX" ]]; then
regex_argument="-R ${CTEST_INCLUDE_REGEX}"
fi
+ if [[ ! -z "$CTEST_EXCLUDE_REGEX" ]]; then
+ regex_argument="${regex_argument} -E ${CTEST_EXCLUDE_REGEX}"
+ fi
# -M Continuous does not run any tests -> -M Experimental --group Continuous
# --test-dir has to be provided despite using a preset
--
GitLab