IffGit has a new shared runner for building Docker images in GitLab CI. Visit https://iffgit.fz-juelich.de/examples/ci-docker-in-docker for more details.

Commit fcece9b5 authored by Gregor Michalicek's avatar Gregor Michalicek
Browse files

Separate the parallel test set from the serial tests

parent 16e1f8aa
enable_testing() enable_testing()
set(Testdirs CuBulk CuBulkXML Fe_1l Fe_1lXML Fe-Atom CuBand CuBandXML CuDOS set(SerialParallelTests CuBulk CuBulkXML Fe_1l Fe_1lXML Fe-Atom CuBand CuBandXML CuDOS CuDOSXML
CuDOSXML Fe_bct_LO Fe_bct_LOXML Fe_bct Fe_bctXML PTO PTOXML Fe_fcc Fe_fccXML Fe_bct Fe_bctXML PTO PTOXML Fe_1l_SOC Fe_1l_SOCXML PTO-SOC PTO-SOCXML Fe_bct_SOC Fe_bct_SOCXML
Fe_1l_SOC Fe_1l_SOCXML PTO-SOC PTO-SOCXML Fe_bct_SOC Fe_bct_SOCXML GaAsMultiUForceXML SiFilmSlicePlotXML)
GaAsMultiUForceXML TiO2eels SiFilmSlicePlotXML)
set(SerialOnlyTests Fe_bct_LO Fe_bct_LOXML Fe_fcc Fe_fccXML TiO2eels)
set(Testdirs ${SerialParallelTests} ${SerialOnlyTests})
set(ParTestdirs ${SerialParallelTests})
#Check if all tests (including those running for a long time) should be executed #Check if all tests (including those running for a long time) should be executed
if (all_tests) if (all_tests)
set(Testdirs ${Testdirs} Bi2Te3 Bi2Te3XML NiO_ldau NiO_ldauXML) set(Testdirs ${Testdirs} Bi2Te3 Bi2Te3XML NiO_ldau NiO_ldauXML)
set(ParTestdirs ${Testdirs} Bi2Te3 Bi2Te3XML NiO_ldau NiO_ldauXML)
endif() endif()
#Add Wannier tests if fleur is compiled with Wannier support #Add Wannier tests if fleur is compiled with Wannier support
if (${FLEUR_USE_WANN}) if (${FLEUR_USE_WANN})
set(Testdirs ${Testdirs} Cwann) set(Testdirs ${Testdirs} Cwann)
set(ParTestdirs ${ParTestdirs} Cwann)
endif() endif()
#The serial tests #The serial tests
...@@ -29,7 +35,7 @@ if (${FLEUR_USE_MPI}) ...@@ -29,7 +35,7 @@ if (${FLEUR_USE_MPI})
else() else()
set(mpi_exec "mpirun -n 2") set(mpi_exec "mpirun -n 2")
endif() endif()
foreach(test ${Testdirs}) foreach(test ${ParTestdirs})
add_test("FLEUR_MPI:${test}" ${CMAKE_CURRENT_SOURCE_DIR}/tests/test.pl add_test("FLEUR_MPI:${test}" ${CMAKE_CURRENT_SOURCE_DIR}/tests/test.pl
${test} "${CMAKE_BINARY_DIR}/fleur_MPI" "${mpi_exec}") ${test} "${CMAKE_BINARY_DIR}/fleur_MPI" "${mpi_exec}")
endforeach(test) endforeach(test)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment