Merge pull request kokkos#7238 from crtrott/compile-all-core-tests

Fix misspelled cmake variable - build all tests
uliegecsm · Aug 22, 2024 · 6a8d23b · 6a8d23b
2 parents 42e781d + 506f625
commit 6a8d23b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 15 deletions.
diff --git a/core/unit_test/CMakeLists.txt b/core/unit_test/CMakeLists.txt
@@ -244,7 +244,7 @@ foreach(Tag Threads;Serial;OpenMP;Cuda;HPX;OpenMPTarget;OpenACC;HIP;SYCL)
     endforeach()
 
     SET(${Tag}_SOURCES2A)
-    SET(${TAG}_TESTNAMES2A
+    SET(${Tag}_TESTNAMES2A
       TeamBasic
       TeamCombinedReducers
       TeamMDRange

diff --git a/core/unit_test/TestViewBadAlloc.hpp b/core/unit_test/TestViewBadAlloc.hpp
@@ -74,12 +74,12 @@ TEST(TEST_CATEGORY, view_bad_alloc) {
                       Kokkos::DefaultHostExecutionSpace>;
 
   if constexpr (execution_space_is_device) {
-    if constexpr (Kokkos::has_shared_space) {
-      test_view_bad_alloc<Kokkos::SharedSpace>();
-    }
-    if constexpr (Kokkos::has_shared_host_pinned_space) {
-      test_view_bad_alloc<Kokkos::SharedHostPinnedSpace>();
-    }
+#ifdef KOKKOS_HAS_SHARED_SPACE
+    test_view_bad_alloc<Kokkos::SharedSpace>();
+#endif
+#ifdef KOKKOS_HAS_SHARED_HOST_PINNED_SPACE
+    test_view_bad_alloc<Kokkos::SharedHostPinnedSpace>();
+#endif
   }
 }
 

diff --git a/core/unit_test/TestWithoutInitializing.hpp b/core/unit_test/TestWithoutInitializing.hpp
@@ -133,8 +133,7 @@ TEST(TEST_CATEGORY, view_alloc) {
       },
       [&](BeginFenceEvent event) {
         return MatchDiagnostic{
-            event.descriptor().find(
-                "Kokkos::Impl::ViewValueFunctor: View init/destroy fence") !=
+            event.descriptor().find("Kokkos::View::initialization") !=
             std::string::npos};
       });
   ASSERT_TRUE(success);
@@ -155,8 +154,7 @@ TEST(TEST_CATEGORY, view_alloc_exec_space) {
       },
       [&](BeginFenceEvent event) {
         return MatchDiagnostic{
-            event.descriptor().find(
-                "Kokkos::Impl::ViewValueFunctor: View init/destroy fence") !=
+            event.descriptor().find("Kokkos::View::initialization") !=
             std::string::npos};
       });
   ASSERT_TRUE(success);
@@ -177,8 +175,7 @@ TEST(TEST_CATEGORY, view_alloc_int) {
       },
       [&](BeginFenceEvent event) {
         return MatchDiagnostic{
-            event.descriptor().find(
-                "Kokkos::Impl::ViewValueFunctor: View init/destroy fence") !=
+            event.descriptor().find("Kokkos::View::initialization") !=
             std::string::npos};
       });
   ASSERT_TRUE(success);
@@ -199,8 +196,7 @@ TEST(TEST_CATEGORY, view_alloc_exec_space_int) {
       },
       [&](BeginFenceEvent event) {
         return MatchDiagnostic{
-            event.descriptor().find(
-                "Kokkos::Impl::ViewValueFunctor: View init/destroy fence") !=
+            event.descriptor().find("Kokkos::View::initialization") !=
             std::string::npos};
       });
   ASSERT_TRUE(success);