Only run 1-proc tests with SCOREC_NO_MPI

Run smoke tests without mpirun given SCOREC_NO_MPI.
Add SCOREC_NO_MPI to the GitHub Actions test matrix.

Signed-off-by: Aiden Woodruff <[email protected]>

Author: bobpaw

.github/workflows/cmake.yml

@@ -15,6 +15,7 @@ jobs:
           - { name: GNU, CC: gcc-10, CXX: g++-10 }
           - { name: LLVM, CC: clang, CXX: clang++ }
         build_type: [Debug, Release]
+        no_mpi: [OFF, ON]
 
     steps:
     - uses: actions/checkout@v4
@@ -30,7 +31,7 @@ jobs:
       env:
         MPICH_CXX: ${{matrix.compiler.CXX}}
         MPICH_CC: ${{matrix.compiler.CC}}
-      run: cmake -S ${{github.workspace}} -B ${{github.workspace}}/build -DCMAKE_CXX_COMPILER=mpicxx -DCMAKE_C_COMPILER=mpicc -DCMAKE_VERBOSE_MAKEFILE=ON -DMESHES=${{github.workspace}}/pumi-meshes -DIS_TESTING=ON -DSCOREC_CXX_WARNINGS=ON -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/build/install
+      run: cmake -S ${{github.workspace}} -B ${{github.workspace}}/build -DCMAKE_CXX_COMPILER=mpicxx -DCMAKE_C_COMPILER=mpicc -DCMAKE_VERBOSE_MAKEFILE=ON -DMESHES=${{github.workspace}}/pumi-meshes -DIS_TESTING=ON -DSCOREC_CXX_WARNINGS=ON -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/build/install -DSCOREC_NO_MPI=${{matrix.no_mpi}}
 
     - name: Build
       env:

test/smokeTesting.cmake

@@ -1,8 +1,16 @@
 function(smoke_test TESTNAME PROCS EXE)
   set(tname smoke_test_${TESTNAME})
+  if(SCOREC_NO_MPI)
+  if(PROCS EQUAL "1")
+  add_test(NAME ${tname} COMMAND ${VALGRIND} ${VALGRIND_ARGS} ${EXE} ${ARGN})
+  else()
+  return()
+  endif()
+  else()
   add_test(
     NAME ${tname}
     COMMAND ${MPIRUN} ${MPIRUN_PROCFLAG} ${PROCS} ${VALGRIND} ${VALGRIND_ARGS} ${EXE} ${ARGN})
+  endif()
   SET_TESTS_PROPERTIES(${tname} PROPERTIES LABELS "SMOKE_TEST" )
 endfunction(smoke_test)
 

test/testing.cmake

@@ -3,7 +3,9 @@ set(MESHES ""
     "Extracted http://scorec.rpi.edu/pumi/pumi_test_meshes.tar.gz")
 function(mpi_test TESTNAME PROCS EXE)
   if(SCOREC_NO_MPI)
+  if(${PROCS} EQUAL "1")
   add_test(NAME ${TESTNAME} COMMAND ${VALGRIND} ${VALGRIND_ARGS} ${EXE} ${ARGN})
+  endif()
   else()
   add_test(
     NAME ${TESTNAME}