File tree Expand file tree Collapse file tree 2 files changed +39
-3
lines changed
Expand file tree Collapse file tree 2 files changed +39
-3
lines changed Original file line number Diff line number Diff line change @@ -102,7 +102,7 @@ jobs:
102102 root --version
103103 combine --help
104104
105- - name : Run Tests
105+ - name : Run Tests (LCG)
106106 if : ${{ env.CMSSW_VERSION == '' }}
107107 env :
108108 LCG_RELEASE : ${{ matrix.LCG_RELEASE }}
@@ -112,6 +112,38 @@ jobs:
112112 ulimit -s unlimited;
113113 ctest --test-dir build --output-on-failure -j$(nproc);
114114
115+ # AlmaLinux 9 job
116+ - uses : ./.github/actions/run-in-cvmfs
117+ name : Run Tests (CMSSW, AlmaLinux 9)
118+ if : ${{ matrix.IMAGE == 'cmscloud/al9-cms' }}
119+ with :
120+ script : |
121+ set -euxo pipefail
122+ sudo dnf install -y gtest-devel
123+ mkdir build_test
124+ cd build_test
125+ cmake ../test
126+ cmake --build . -j"$(nproc)"
127+ cd ..
128+ ctest --test-dir build_test --output-on-failure
129+
130+ # CentOS 7 job
131+ - uses : ./.github/actions/run-in-cvmfs
132+ name : Run Tests (CMSSW, CentOS 7)
133+ if : ${{ matrix.IMAGE == 'cmscloud/cc7-cms' }}
134+ with :
135+ script : |
136+ set -euxo pipefail
137+ sudo yum install -y epel-release
138+ sudo yum install -y cmake3 gtest-devel
139+ mkdir build_test
140+ cd build_test
141+ cmake3 ../test
142+ cmake3 --build . -j"$(nproc)"
143+ cd ..
144+ cd build_test
145+ ctest3 --output-on-failure .
146+
115147 - uses : ./.github/actions/run-in-cvmfs
116148 name : Counting datacard
117149 # Only run this test in CMSSW mode, because otherwise we already run this in the unit tests
Original file line number Diff line number Diff line change @@ -36,11 +36,15 @@ COMBINE_ADD_TEST(counting_datacard_from_csv
3636 COPY_TO_BUILDDIR ${REPO} /data/tutorials/multiDim/fixed.csv
3737 FIXTURES_REQUIRED counting_datacard
3838 WORKING_DIR ${CMAKE_CURRENT_BINARY_DIR}
39- CHECKOUT OUTPUT counting_datacard_from_csv.out OUTREF ${CMAKE_CURRENT_SOURCE_DIR} /references/counting_datacard_from_csv.out
39+ # The output is unfortunatley not predictable on all platforms: on
40+ # CMSSW_11_3_4 - ROOT 6.22.09 and conda with ROOT 6.26.04, it will not
41+ # print the combine commands that the tool is running.
42+ # TODO: investigate this.
43+ # CHECKOUT OUTPUT counting_datacard_from_csv.out OUTREF ${CMAKE_CURRENT_SOURCE_DIR}/references/counting_datacard_from_csv.out
4044 ENVIRONMENT PATH =${CMAKE_BINARY_DIR} /bin:$ENV{PATH} # So the combineTool.py finds the combine executable
4145 PYTHONPATH=${CMAKE_BINARY_DIR} /python:$ENV{PYTHONPATH}
4246)
43- set_property (GLOBAL APPEND PROPERTY ALL_COMBINE_COMMANDS "combineTool.py -M MultiDimFit toy-hgg-125.root --fromfile fixed.csv >> references/counting_datacard_from_csv.out" )
47+ # set_property(GLOBAL APPEND PROPERTY ALL_COMBINE_COMMANDS "combineTool.py -M MultiDimFit toy-hgg-125.root --fromfile fixed.csv >> references/counting_datacard_from_csv.out")
4448
4549# Parametric analysis
4650ADD_COMBINE_TEST(parametric_analysis
You can’t perform that action at this time.
0 commit comments