From d304c14448001df85066d1afaab10982a7c49bbb Mon Sep 17 00:00:00 2001 From: Manuel Huber Date: Wed, 24 Apr 2024 19:59:53 +0200 Subject: [PATCH] move tests with visualization to own label also do not run them on CI, as there no Xorg display is available? --- .github/workflows/main.yml | 4 ++-- tests/basics/CMakeLists.txt | 10 +++++++--- tests/confinement/CMakeLists.txt | 12 +++++++++--- tests/confinement/macros/complex-volume.mac | 2 +- .../confinement/macros/geometrical-and-physical.mac | 2 +- tests/confinement/macros/geometrical-or-physical.mac | 2 +- tests/confinement/macros/geometrical.mac | 2 +- tests/confinement/macros/init.mac | 3 +++ tests/confinement/macros/native-surface.mac | 2 +- tests/confinement/macros/native-volume.mac | 2 +- tests/confinement/macros/vis.mac | 3 +++ 11 files changed, 30 insertions(+), 14 deletions(-) create mode 100644 tests/confinement/macros/init.mac diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 92dd459..ed84de3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -44,11 +44,11 @@ jobs: if: ${{ matrix.container_version != 'slim' }} run: | cd build - ctest --output-on-failure + ctest --output-on-failure --label-exclude 'vis' - name: Run minimal test suite if: ${{ matrix.container_version == 'slim' }} run: | cd build - ctest --output-on-failure --label-exclude extra + ctest --output-on-failure --label-exclude 'extra|vis' # vim: expandtab tabstop=2 shiftwidth=2 diff --git a/tests/basics/CMakeLists.txt b/tests/basics/CMakeLists.txt index 0cfda90..15393a8 100644 --- a/tests/basics/CMakeLists.txt +++ b/tests/basics/CMakeLists.txt @@ -9,10 +9,11 @@ foreach(_file ${_aux}) configure_file(${PROJECT_SOURCE_DIR}/${_file} ${PROJECT_BINARY_DIR}/${_file} COPYONLY) endforeach() -set(_macros print-volumes.mac vis-co60.mac) -set(_macros_extra run-2nbb.mac vis-2nbb.mac) +set(_macros print-volumes.mac) +set(_macros_extra run-2nbb.mac) +set(_macros_vis vis-co60.mac vis-2nbb.mac) -foreach(_mac ${_macros} ${_macros_extra}) +foreach(_mac ${_macros} ${_macros_extra} ${_macros_vis}) add_test(NAME basics/${_mac} COMMAND remage-cli -g gdml/main.gdml -- macros/${_mac}) endforeach() @@ -23,3 +24,6 @@ endforeach() list(TRANSFORM _macros_extra PREPEND "basics/") set_tests_properties(${_macros_extra} PROPERTIES LABELS extra) + +list(TRANSFORM _macros_vis PREPEND "basics/") +set_tests_properties(${_macros_vis} PROPERTIES LABELS vis) diff --git a/tests/confinement/CMakeLists.txt b/tests/confinement/CMakeLists.txt index 60e2922..a070d9a 100644 --- a/tests/confinement/CMakeLists.txt +++ b/tests/confinement/CMakeLists.txt @@ -13,8 +13,14 @@ set(_macros complex-volume.mac geometrical.mac native-surface.mac geometrical-an geometrical-or-physical.mac native-volume.mac) foreach(_mac ${_macros}) - add_test(NAME confinement/${_mac} COMMAND remage-cli -g gdml/geometry.gdml -- macros/${_mac}) - add_test(NAME confinement-mt/${_mac} COMMAND remage-cli -g gdml/geometry.gdml -t 2 - macros/${_mac}) + add_test(NAME confinement/${_mac} COMMAND remage-cli -g gdml/geometry.gdml -o test-out.root -- + macros/${_mac}) + + add_test(NAME confinement-mt/${_mac} COMMAND remage-cli -g gdml/geometry.gdml -t 2 -o + test-out.root -- macros/${_mac}) set_tests_properties(confinement-mt/${_mac} PROPERTIES LABELS mt) + + add_test(NAME confinement-vis/${_mac} COMMAND remage-cli -g gdml/geometry.gdml -o test-out.root + -- macros/vis.mac macros/${_mac}) + set_tests_properties(confinement-vis/${_mac} PROPERTIES LABELS vis) endforeach() diff --git a/tests/confinement/macros/complex-volume.mac b/tests/confinement/macros/complex-volume.mac index 0aa7097..e82581b 100644 --- a/tests/confinement/macros/complex-volume.mac +++ b/tests/confinement/macros/complex-volume.mac @@ -1,4 +1,4 @@ -/control/execute macros/vis.mac +/control/execute macros/init.mac /RMG/Generator/Confine Volume diff --git a/tests/confinement/macros/geometrical-and-physical.mac b/tests/confinement/macros/geometrical-and-physical.mac index 89edafb..d045936 100644 --- a/tests/confinement/macros/geometrical-and-physical.mac +++ b/tests/confinement/macros/geometrical-and-physical.mac @@ -1,4 +1,4 @@ -/control/execute macros/vis.mac +/control/execute macros/init.mac /RMG/Generator/Confine Volume diff --git a/tests/confinement/macros/geometrical-or-physical.mac b/tests/confinement/macros/geometrical-or-physical.mac index fd9c4ca..565f7f5 100644 --- a/tests/confinement/macros/geometrical-or-physical.mac +++ b/tests/confinement/macros/geometrical-or-physical.mac @@ -1,4 +1,4 @@ -/control/execute macros/vis.mac +/control/execute macros/init.mac /RMG/Generator/Confine Volume diff --git a/tests/confinement/macros/geometrical.mac b/tests/confinement/macros/geometrical.mac index c93a7d5..4ea1358 100644 --- a/tests/confinement/macros/geometrical.mac +++ b/tests/confinement/macros/geometrical.mac @@ -1,4 +1,4 @@ -/control/execute macros/vis.mac +/control/execute macros/init.mac /RMG/Generator/Confine Volume diff --git a/tests/confinement/macros/init.mac b/tests/confinement/macros/init.mac new file mode 100644 index 0000000..1f2921d --- /dev/null +++ b/tests/confinement/macros/init.mac @@ -0,0 +1,3 @@ +/run/initialize + +/RMG/Manager/Logging/LogLevel debug diff --git a/tests/confinement/macros/native-surface.mac b/tests/confinement/macros/native-surface.mac index e19e624..fba0f4d 100644 --- a/tests/confinement/macros/native-surface.mac +++ b/tests/confinement/macros/native-surface.mac @@ -1,4 +1,4 @@ -/control/execute macros/vis.mac +/control/execute macros/init.mac /RMG/Generator/Confine Volume /RMG/Generator/Confinement/SampleOnSurface true diff --git a/tests/confinement/macros/native-volume.mac b/tests/confinement/macros/native-volume.mac index 3a18f16..55ca366 100644 --- a/tests/confinement/macros/native-volume.mac +++ b/tests/confinement/macros/native-volume.mac @@ -1,4 +1,4 @@ -/control/execute macros/vis.mac +/control/execute macros/init.mac /RMG/Generator/Confine Volume /RMG/Generator/Confinement/Physical/AddVolume Box diff --git a/tests/confinement/macros/vis.mac b/tests/confinement/macros/vis.mac index 01c5b91..68a89a5 100644 --- a/tests/confinement/macros/vis.mac +++ b/tests/confinement/macros/vis.mac @@ -19,5 +19,8 @@ /vis/modeling/trajectories/drawByCharge-0/default/setDrawStepPts true /vis/modeling/trajectories/drawByCharge-0/default/setStepPtsSize 2 +/vis/geometry/set/forceSolid +/vis/geometry/set/colour all 10 1 1 1 0.3 + /vis/scene/add/hits /vis/scene/endOfEventAction accumulate