Split ORANGE test into subtests (#1234)

celeritas-project · May 15, 2024 · 9e06741 · 9e06741
1 parent 124e0db
commit 9e06741
Show file tree

Hide file tree

Showing 14 changed files with 1,241 additions and 1,161 deletions.
diff --git a/scripts/dev/iwyu-apple-clang.imp b/scripts/dev/iwyu-apple-clang.imp
@@ -8,7 +8,7 @@
   { include: ["@<__algorithm/.*>", private, "<algorithm>", public ] },
   { include: ["@<__chrono/.*>", private, "<chrono>", public ] },
   { include: ["@<__functional/.*>", private, "<functional>", public ] },
-  { include: ["@<__fwd/string_view.h>", private, "<string_view>", public ] },
+  { include: ["@<__fwd/(.*)\\.h>", private, "<\\1>", public ] },
   { include: ["@<__iterator/.*>", private, "<iterator>", public ] },
   { include: ["@<__memory/.*>", private, "<memory>", public ] },
   { include: ["@<__mutex_base>", private, "<mutex>", public ] },

diff --git a/scripts/dev/run-iwyu.sh b/scripts/dev/run-iwyu.sh
@@ -43,5 +43,4 @@ if [ -z "${SKIP_FORMAT}" ]; then
   git add -u :/
   SKIP_GCF=1 git commit --amend -m "IWYU+Clean" >/dev/null
   git reset HEAD^
-  git co HEAD -- ":/src/celeritas/*/generated/*"
 fi
diff --git a/test/Test.hh b/test/Test.hh
@@ -10,7 +10,7 @@
 #include <cmath>
 #include <string>
 #include <string_view>
-#include <gtest/gtest.h>
+#include <gtest/gtest.h>  // IWYU pragma: export
 
 #include "celeritas_config.h"
 

diff --git a/test/celeritas_test.hh b/test/celeritas_test.hh
@@ -11,9 +11,9 @@
 #include <iostream>
 #include <string_view>
 
+// IWYU pragma: begin_exports
 #include "celeritas_config.h"
 
-// IWYU pragma: begin_exports
 #include "Test.hh"
 #include "TestMacros.hh"
 #include "TestMain.hh"

diff --git a/test/orange/CMakeLists.txt b/test/orange/CMakeLists.txt
@@ -30,6 +30,14 @@ if(CELERITAS_USE_Geant4)
   celeritas_get_g4libs(_g4_geo_libs geometry)
 endif()
 
+if(CELERITAS_USE_Geant4 AND CELERITAS_REAL_TYPE STREQUAL "double")
+  set(_use_g4org TRUE)
+  set(_needs_g4org)
+else()
+  set(_use_g4org FALSE)
+  set(_needs_g4org DISABLE)
+endif()
+
 #-----------------------------------------------------------------------------#
 # SETUP
 #-----------------------------------------------------------------------------#
@@ -45,9 +53,14 @@ celeritas_setup_tests(SERIAL PREFIX orange
 celeritas_add_test(BoundingBoxUtils.test.cc)
 celeritas_add_test(MatrixUtils.test.cc)
 celeritas_add_test(OrangeTypes.test.cc)
-celeritas_add_device_test(Orange)
 celeritas_add_test(RaytraceImager.test.cc GPU)
 
+# High level
+celeritas_add_test(Orange.test.cc)
+celeritas_add_test(OrangeGeant.test.cc ${_needs_g4org})
+celeritas_add_test(OrangeJson.test.cc ${_needs_json})
+celeritas_add_device_test(OrangeShift ${_needs_json})
+
 celeritas_add_test(detail/UniverseIndexer.test.cc)
 
 # Bounding interval hierarchy
@@ -128,7 +141,7 @@ celeritas_add_test(univ/detail/SenseCalculator.test.cc)
 
 #-----------------------------------------------------------------------------#
 # Geant4 construction
-if(CELERITAS_USE_Geant4 AND CELERITAS_REAL_TYPE STREQUAL "double")
+if(_use_g4org)
   set(CELERITASTEST_PREFIX orange/g4org)
 
   celeritas_add_test(g4org/Converter.test.cc)