From be364887b7102207833125af29f8be9b0519b749 Mon Sep 17 00:00:00 2001
From: ralfulrich <ralf.ulrich@kit.edu>
Date: Tue, 26 Jan 2021 10:08:51 +0100
Subject: [PATCH] on CI, use C8-pythia for now...
---
.gitlab-ci.yml | 6 +++---
tests/modules/testPythia8.cpp | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8992c3c45..2fc025461 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -92,7 +92,7 @@ check-clang-format:
script:
- mkdir -p build
- cd build
- - cmake .. -DCMAKE_BUILD_TYPE=Debug -DUSE_PYTHIA8_C8=SYSTEM
+ - cmake .. -DCMAKE_BUILD_TYPE=Debug -DUSE_PYTHIA8_C8=C8
rules:
- if: $CI_MERGE_REQUEST_ID
- if: $CI_COMMIT_TAG
@@ -450,7 +450,7 @@ install-clang-8:
- corsika
script:
- cd build
- - cmake .. -DCMAKE_BUILD_TYPE=Release -DUSE_PYTHIA8_C8=SYSTEM
+ - cmake .. -DCMAKE_BUILD_TYPE=Release -DUSE_PYTHIA8_C8=C8
- cmake --build . -- -j4
- set -o pipefail
- ctest -j4
@@ -513,7 +513,7 @@ coverage:
- corsika
script:
- cd build
- - cmake .. -DCMAKE_BUILD_TYPE=Coverage -DUSE_PYTHIA8_C8=SYSTEM
+ - cmake .. -DCMAKE_BUILD_TYPE=Coverage -DUSE_PYTHIA8_C8=C8
- cmake --build . -- -j4
- ctest -j4
- cmake --build . --target coverage
diff --git a/tests/modules/testPythia8.cpp b/tests/modules/testPythia8.cpp
index 43e767fad..8ddd613ad 100644
--- a/tests/modules/testPythia8.cpp
+++ b/tests/modules/testPythia8.cpp
@@ -170,6 +170,6 @@ TEST_CASE("pythia process") {
model.doInteraction(view);
[[maybe_unused]] const GrammageType length = model.getInteractionLength(particle);
CHECK(length / 1_kg * square(1_m) == Approx(43.04).margin(5e-1));
- CHECK(view.getSize() == 40);
+ CHECK(view.getSize() == 38);
}
}
--
GitLab