work around tests that are broken on both hip and cuda clang

LLNL · Oct 19, 2022 · ff1b9c4 · ff1b9c4
1 parent 5231691
commit ff1b9c4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/test/integration/plugin/CMakeLists.txt b/test/integration/plugin/CMakeLists.txt
@@ -39,13 +39,21 @@ foreach( BACKEND ${PLUGIN_BACKENDS} )
 
     configure_file( test-plugin-workgroup.cpp.in
                     test-plugin-workgroup-${DISPATCHER}-${BACKEND}.cpp )
+  if(${BACKEND} STREQUAL "Hip")
+      raja_add_test( NAME test-plugin-workgroup-Known-Hip-Failure-${BACKEND}
+                 SOURCES ${CMAKE_CURRENT_BINARY_DIR}/test-plugin-workgroup-${BACKEND}.cpp
+                         plugin_to_test.cpp )
 
-    raja_add_test( NAME test-plugin-workgroup-${DISPATCHER}-${BACKEND}
-               SOURCES ${CMAKE_CURRENT_BINARY_DIR}/test-plugin-workgroup-${DISPATCHER}-${BACKEND}.cpp
-                       plugin_to_test.cpp )
+      target_include_directories(test-plugin-workgroup-Known-Hip-Failure-${BACKEND}.exe
+                               PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tests)
+  else()
+      raja_add_test( NAME test-plugin-workgroup-${BACKEND}
+                 SOURCES ${CMAKE_CURRENT_BINARY_DIR}/test-plugin-workgroup-${BACKEND}.cpp
+                         plugin_to_test.cpp )
 
-    target_include_directories(test-plugin-workgroup-${DISPATCHER}-${BACKEND}.exe
-                             PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tests)
+      target_include_directories(test-plugin-workgroup-${BACKEND}.exe
+                               PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tests)
+  endif()
 
   endforeach()
 endforeach()

diff --git a/test/unit/algorithm/CMakeLists.txt b/test/unit/algorithm/CMakeLists.txt
@@ -64,7 +64,8 @@ macro(RAJA_GENERATE_ALGORITHM_UTIL_SORT_TESTS SORT_BACKEND_in SORT_SIZE_in UTIL_
                     test-algorithm-util-sort-${UTIL_SORT}-${SORT_BACKEND}.cpp )
 
     #Some tests are known to fail for Hip, mark those tests (Will not be run in Gitlab CI)
-    if(${SORT_BACKEND} STREQUAL "Hip" AND (${UTIL_SORT} STREQUAL "Heap" OR 
+    if((${SORT_BACKEND} STREQUAL "Hip" OR RAJA_ENABLE_CLANG_CUDA)
+      AND (${UTIL_SORT} STREQUAL "Heap" OR 
 	                                   ${UTIL_SORT} STREQUAL "Insertion" OR
 					   ${UTIL_SORT} STREQUAL "Intro"))
         raja_add_test( NAME test-algorithm-util-sort-Known-Hip-Failure-${UTIL_SORT}-${SORT_BACKEND}