Update Tests

Author: OliverRietmann

.github/workflows/unit-tests.yml

@@ -7,41 +7,56 @@ on:
     branches:
       - '**'
 
+permissions:
+  contents: read
+  actions: read
+  checks: write
+  pull-requests: write
+
 jobs:
   unit-tests:
     runs-on: cern-nextgen-h100
     container: registry.cern.ch/ngt-wp1.7/wp1.7-soa-wrapper@sha256:16432eae6635379637e67c4cc00334c46b6dce845b83da7e75fb754d24266897
     steps:
       - uses: actions/checkout@v4
-      - name: cpu_gcc
-        env:
-          CXX: g++
-          CC: gcc
-          TEST_DIR: tests/cpu
-        run: &build-and-test |
-          cmake -B ${{github.workspace}}/build/ -DCMAKE_COMPILE_WARNING_AS_ERROR=ON
-          cmake --build ${{github.workspace}}/build/${TEST_DIR}
-          ctest --test-dir ${{github.workspace}}/build/${TEST_DIR} --output-on-failure
-          rm -rf ${{github.workspace}}/build
-      - name: cpu_clang
-        env:
-          CXX: clang++
-          CC: clang
-          TEST_DIR: tests/cpu
-        run: *build-and-test
-      - name: gpu_gcc
+        name: checkout repository
+      - name: gcc
         env:
           CXX: g++
           CC: gcc
           NVCC_CCBIN: gcc
           CUDACXX: nvcc
-          TEST_DIR: tests/gpu
-        run: *build-and-test
-      - name: gpu_clang
+          TEST_TAG: gcc
+        run: &build-and-test |
+          cmake -B ${{github.workspace}}/build/ -DBUILD_TESTING=ON -DCMAKE_COMPILE_WARNING_AS_ERROR=ON
+          cmake --build ${{github.workspace}}/build/
+          ctest --test-dir ${{github.workspace}}/build/tests --output-on-failure --output-junit /root/test_${TEST_TAG}.xml
+          rm -rf ${{github.workspace}}/build
+      - name: clang
         env:
           CXX: clang++
           CC: clang
           NVCC_CCBIN: clang
           CUDACXX: nvcc
-          TEST_DIR: tests/gpu
+          TEST_TAG: clang
         run: *build-and-test
+      - name: upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: junit-artifacts
+          path: |
+            /root/test_gcc.xml
+            /root/test_clang.xml
+  publish-test-results:
+    needs: unit-tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: download artifact
+        uses: actions/download-artifact@v5
+        with:
+          name: junit-artifacts
+      - name: publish test results
+        uses: EnricoMi/publish-unit-test-result-action@v2
+        if: (!cancelled())
+        with:
+          files: "test_*.xml"

CMakeLists.txt

@@ -1,11 +1,15 @@
 cmake_minimum_required(VERSION 4.0)
 project(memlayout LANGUAGES CXX)
 
-#option(ENABLE_CPU "Build CPU tests" ON)
-#option(ENABLE_CUDA "Build CUDA tests" ON)
+option(BUILD_TESTING "Build unit tests" OFF)
+option(BUILD_DOCS "Build documentation" OFF)
 
 add_subdirectory(memlayout)
 
-add_subdirectory(tests EXCLUDE_FROM_ALL)
+if(BUILD_TESTING)
+  add_subdirectory(tests)
+endif()
 
-add_subdirectory(docs EXCLUDE_FROM_ALL)
+if(BUILD_DOCS)
+  add_subdirectory(docs)
+endif()

tests/CMakeLists.txt

@@ -1,3 +1,7 @@
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3")
+
 include(FetchContent)
 FetchContent_Declare(
     googletest
@@ -10,4 +14,9 @@ include(GoogleTest)
 
 add_subdirectory(cpu)
 
-add_subdirectory(gpu)
+find_package(CUDAToolkit QUIET)
+if(CUDAToolkit_FOUND OR CMAKE_CUDA_COMPILER)
+    add_subdirectory(gpu)
+else()
+    message(STATUS "CUDA not found - skipping GPU tests")
+endif()

tests/cpu/CMakeLists.txt

@@ -1,9 +1,5 @@
-set(CMAKE_CXX_STANDARD 20)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3")
-
 add_executable(test_cpu test_cpu.cpp)
-target_include_directories(test_cpu PUBLIC ${CMAKE_SOURCE_DIR}/tests/include ${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories(test_cpu PUBLIC ${CMAKE_SOURCE_DIR}/tests/include)
 target_link_libraries(test_cpu PRIVATE memlayout::Wrapper GTest::gtest_main)
 
 gtest_discover_tests(test_cpu)

tests/gpu/CMakeLists.txt

@@ -4,7 +4,7 @@ enable_language(CUDA)
 set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} --expt-relaxed-constexpr")
 
 add_executable(test_cuda test_cuda.cu)
-target_include_directories(test_cuda PUBLIC ${CMAKE_SOURCE_DIR}/tests/include ${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories(test_cuda PUBLIC ${CMAKE_SOURCE_DIR}/tests/include)
 target_link_libraries(test_cuda PRIVATE memlayout::Wrapper GTest::gtest_main)
 set_target_properties(test_cuda PROPERTIES CUDA_SEPARABLE_COMPILATION ON CUDA_ARCHITECTURES native)