Skip to content

Do not execute the test case that assumes geometry is there if there is no geometry #18639

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Do not execute the test case that assumes geometry is there if there is no geometry #18639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
256bf00
[core] If geom is ON, define the preprocessor variable R__HAS_GEOM
dpiparo May 7, 2025
025e5ac
[test] Exclude test case if no geometry is available
dpiparo May 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions cmake/modules/RootConfiguration.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,6 +496,12 @@ if (uring)
else()
set(hasuring undef)
endif()
if (geom)
set(hasgeom define)
else()
set(hasgeom undef)
endif()


CHECK_CXX_SOURCE_COMPILES("
inline __attribute__((always_inline)) bool TestBit(unsigned long f) { return f != 0; };
Expand Down
2 changes: 2 additions & 0 deletions config/RConfigure.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,6 @@

#@hasuring@ R__HAS_URING /**/

#@hasgeom@ R__HAS_GEOM /**/

#endif
4 changes: 2 additions & 2 deletions core/metacling/test/TClingDataMemberInfoTests.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ TEST(TClingDataMemberInfo, Offset)
// Make sure ROOT's Core constexpr constants work
EXPECT_EQ(3000, *(int*)gROOT->GetGlobal("kError")->GetAddress());

#ifdef R__USE_CXXMODULES
#if defined(R__USE_CXXMODULES) && defined(R__HAS_GEOM)
// gGeoManager is defined in the Geom libraries and we want to make sure we
// do not load it when autoloading is off. We can only test this in modules
// mode because gGeoManager is not part of the PCH and non-modular ROOT has
Expand All @@ -250,5 +250,5 @@ TEST(TClingDataMemberInfo, Offset)
TGlobal *GeoManagerInfo = gROOT->GetGlobal("gGeoManager");
TInterpreter::SuspendAutoLoadingRAII autoloadOff(gInterpreter);
EXPECT_EQ(-1L, (ptrdiff_t)GeoManagerInfo->GetAddress());
#endif // R__USE_CXXMODULES
#endif // R__USE_CXXMODULES and R__HAS_GEOM
}
Loading