From 198c032e4d28ba00ce5a22713427561aea79678c Mon Sep 17 00:00:00 2001
From: olemorud <ole.kristian.morud@cern.ch>
Date: Fri, 10 Feb 2023 10:01:42 +0100
Subject: [PATCH] [ci] Use extra flags for ctest on windows
---
.../workflows/rootci-installers/build_root.py | 25 +++++++++++++------
1 file changed, 18 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/rootci-installers/build_root.py b/.github/workflows/rootci-installers/build_root.py
index fd9df13347c..c93726474c3 100755
--- a/.github/workflows/rootci-installers/build_root.py
+++ b/.github/workflows/rootci-installers/build_root.py
@@ -21,9 +21,16 @@ import tarfile
from hashlib import sha1
import openstack
-from build_utils import (cmake_options_from_dict, die, download_latest,
- load_config, print_shell_log, subprocess_with_log,
- upload_file, warning)
+from build_utils import (
+ cmake_options_from_dict,
+ die,
+ download_latest,
+ load_config,
+ print_shell_log,
+ subprocess_with_log,
+ upload_file,
+ warning,
+)
S3CONTAINER = 'ROOT-build-artifacts' # Used for uploads
S3URL = 'https://s3.cern.ch/swift/v1/' + S3CONTAINER # Used for downloads
@@ -150,6 +157,9 @@ def main():
if result != 0:
die(result, f"Failed to pull {base_ref}", shell_log)
+
+ extra_ctest_flags = f"-C {buildtype}" if os.name == "nt" else ""
+
if pull_request:
print("::group::Rebase {base_ref} onto {head_ref}")
shell_log = rebase(base_ref, head_ref, workdir, shell_log)
@@ -162,7 +172,7 @@ def main():
if( options_dict['testing'].lower() == "on"
and options_dict['roottest'].lower() == "on"):
print("::group::Run tests")
- shell_log = test(workdir, shell_log)
+ shell_log = test(workdir, shell_log, extra_ctest_flags)
print("::endgroup::")
else:
print(f"::group::Build release branch {base_ref}")
@@ -172,7 +182,7 @@ def main():
if( options_dict['testing'].lower() == "on"
and options_dict['roottest'].lower() == "on"):
print("::group::Run tests")
- shell_log = test(workdir, shell_log)
+ shell_log = test(workdir, shell_log, extra_ctest_flags)
print("::endgroup::")
print("::group::Archive and upload")
@@ -182,10 +192,11 @@ def main():
print_shell_log(shell_log)
-def test(workdir, shell_log):
+def test(workdir: str, shell_log: str, extra_ctest_flags: str):
+
result, shell_log = subprocess_with_log(f"""
cd '{workdir}/build'
- ctest -j{os.cpu_count()}
+ ctest -j{os.cpu_count()} {extra_ctest_flags}
""", shell_log)
if result != 0:
--
GitLab