Skip to content

Commit

Permalink
Fix path to legacy/g3d/geometry.C macro
Browse files Browse the repository at this point in the history
It must be executed before some other tutorials
  • Loading branch information
linev committed Feb 5, 2025
1 parent ece33a7 commit 2e67db7
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions tutorials/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ if(MSVC AND NOT llvm13_broken_tests)
endif()

set(all_veto hsimple.C
visualisation/geom/geometry.C
legacy/g3d/geometry.C
${extra_veto}
${gdml_veto}
${gui_veto}
Expand Down Expand Up @@ -637,7 +637,7 @@ file(GLOB multithreaded RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${multithreaded})
ROOT_ADD_TEST(tutorial-hsimple COMMAND ${ROOT_root_CMD} -b -l -n -q ${CMAKE_CURRENT_SOURCE_DIR}/hsimple.C
PASSRC 255 FAILREGEX "Error in" "error:" "warning: Failed to call" LABELS tutorial ENVIRONMENT ${TUTORIAL_ENV})
if(ROOT_geom_FOUND)
ROOT_ADD_TEST(tutorial-visualisation-geom-geometry COMMAND ${ROOT_root_CMD} -b -l -n -q ${CMAKE_CURRENT_SOURCE_DIR}/visualisation/geom/geometry.C
ROOT_ADD_TEST(tutorial-legacy-g3d-geometry COMMAND ${ROOT_root_CMD} -b -l -n -q ${CMAKE_CURRENT_SOURCE_DIR}/legacy/g3d/geometry.C
FAILREGEX "Error in" "error:" "warning: Failed to call" LABELS tutorial ENVIRONMENT ${TUTORIAL_ENV})
endif()
# define Python GNN parsing tutorial needed to run before
Expand Down
2 changes: 1 addition & 1 deletion tutorials/legacy/g3d/na49geomfile.C
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/// \file
/// \ingroup tutorial_g3d_legacy
/// Before executing this macro, the file makegeometry.C must have been executed
/// Before executing this macro, the file geometry.C must have been executed
///
/// \macro_code
///
Expand Down
2 changes: 1 addition & 1 deletion tutorials/legacy/g3d/na49geomfile.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## \file
## \ingroup tutorial_g3d_legacy
## Before executing this macro, the file namakegeometry.C must have been executed
## Before executing this macro, the file geometry.C must have been executed
##
## \macro_code
##
Expand Down

0 comments on commit 2e67db7

Please sign in to comment.