Skip to content

Commit 1bd1e3a

Browse files
memmettmemmett
committed
When building with MPI, build all tests/examples.
1 parent 0a03b34 commit 1bd1e3a

File tree

8 files changed

+148
-160
lines changed

8 files changed

+148
-160
lines changed

‎examples/advection_diffusion/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ if(${pfasst_WITH_MPI})
1919
set(advec_mpi_examples
2020
mpi_pfasst
2121
)
22-
set(all_advec_examples ${advec_mpi_examples})
22+
set(all_advec_examples ${advec_examples} ${advec_mpi_examples})
2323
else()
2424
set(all_advec_examples ${advec_examples})
2525
endif()

‎examples/scalar/CMakeLists.txt‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,9 @@ include_directories(
66
${3rdparty_INCLUDES}
77
)
88

9-
if(NOT ${pfasst_WITH_MPI})
10-
set(scalar_examples
11-
scalar_sdc
12-
)
13-
endif()
9+
set(scalar_examples
10+
scalar_sdc
11+
)
1412

1513
foreach(example ${scalar_examples})
1614
add_executable(${example} ${CMAKE_CURRENT_SOURCE_DIR}/${example}.cpp)

‎examples/vanderpol/CMakeLists.txt‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,9 @@ include_directories(
66
${3rdparty_INCLUDES}
77
)
88

9-
if(NOT ${pfasst_WITH_MPI})
10-
set(vanderpol_examples
11-
vdp_sdc
12-
)
13-
endif()
9+
set(vanderpol_examples
10+
vdp_sdc
11+
)
1412

1513
foreach(example ${vanderpol_examples})
1614
add_executable(${example} ${CMAKE_CURRENT_SOURCE_DIR}/${example}.cpp)

‎tests/CMakeLists.txt‎

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -6,37 +6,35 @@ include_directories(
66
${CMAKE_CURRENT_SOURCE_DIR}
77
)
88

9-
if(NOT ${pfasst_WITH_MPI})
10-
set(TESTS
11-
test_quadrature
12-
test_polynomial
13-
)
9+
set(TESTS
10+
test_quadrature
11+
test_polynomial
12+
)
1413

15-
foreach(test ${TESTS})
16-
message(STATUS " ${test}")
17-
add_executable(${test} ${test}.cpp)
18-
if(${pfasst_NUM_DEPENDEND_TARGETS} GREATER 0)
19-
add_dependencies(${test} ${pfasst_DEPENDEND_TARGETS})
20-
endif()
21-
if(${pfasst_TESTS_NUM_DEPENDEND_TARGETS} GREATER 0)
22-
add_dependencies(${test} ${pfasst_TESTS_DEPENDEND_TARGETS})
23-
endif()
24-
target_link_libraries(${test}
25-
${3rdparty_DEPENDEND_LIBS}
26-
${TESTS_3rdparty_DEPENDEND_LIBS}
27-
${pfasst_DEPENDEND_LIBS}
28-
)
29-
if(pfasst_WITH_GCC_PROF AND ${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
30-
set_target_properties(${test}
31-
PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS} -ftest-coverage -fprofile-arcs"
32-
LINK_FLAGS "-fprofile-arcs"
33-
)
34-
endif()
35-
add_test(NAME ${test}
36-
COMMAND ${CMAKE_BINARY_DIR}/tests/${test} --gtest_output=xml:${test}_out.xml
14+
foreach(test ${TESTS})
15+
message(STATUS " ${test}")
16+
add_executable(${test} ${test}.cpp)
17+
if(${pfasst_NUM_DEPENDEND_TARGETS} GREATER 0)
18+
add_dependencies(${test} ${pfasst_DEPENDEND_TARGETS})
19+
endif()
20+
if(${pfasst_TESTS_NUM_DEPENDEND_TARGETS} GREATER 0)
21+
add_dependencies(${test} ${pfasst_TESTS_DEPENDEND_TARGETS})
22+
endif()
23+
target_link_libraries(${test}
24+
${3rdparty_DEPENDEND_LIBS}
25+
${TESTS_3rdparty_DEPENDEND_LIBS}
26+
${pfasst_DEPENDEND_LIBS}
27+
)
28+
if(pfasst_WITH_GCC_PROF AND ${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
29+
set_target_properties(${test}
30+
PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS} -ftest-coverage -fprofile-arcs"
31+
LINK_FLAGS "-fprofile-arcs"
3732
)
38-
endforeach(test)
39-
endif()
33+
endif()
34+
add_test(NAME ${test}
35+
COMMAND ${CMAKE_BINARY_DIR}/tests/${test} --gtest_output=xml:${test}_out.xml
36+
)
37+
endforeach(test)
4038

4139
if(${pfasst_BUILD_EXAMPLES})
4240
add_subdirectory(examples)

‎tests/examples/advection_diffusion/CMakeLists.txt‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -42,37 +42,37 @@ if(${pfasst_WITH_MPI})
4242
COMMAND ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 4 ${CMAKE_BINARY_DIR}/tests/examples/advection_diffusion/${test} --gtest_output=xml:${test}_out.xml
4343
)
4444
endforeach(test)
45-
else()
46-
set(TESTS
47-
test_advection_diffusion
48-
)
45+
endif()
4946

50-
foreach(test ${TESTS})
51-
message(STATUS " ${test}")
52-
add_executable(${test} ${test}.cpp)
53-
if(NOT FFTW_FOUND)
54-
add_dependencies(${test} fftw3)
55-
endif()
56-
if(${pfasst_NUM_DEPENDEND_TARGETS} GREATER 0)
57-
add_dependencies(${test} ${pfasst_DEPENDEND_TARGETS})
58-
endif()
59-
if(${pfasst_TESTS_NUM_DEPENDEND_TARGETS} GREATER 0)
60-
add_dependencies(${test} ${pfasst_TESTS_DEPENDEND_TARGETS})
61-
endif()
62-
target_link_libraries(${test}
63-
${3rdparty_DEPENDEND_LIBS}
64-
${TESTS_3rdparty_DEPENDEND_LIBS}
65-
${FFTW_LIBRARIES}
66-
${pfasst_DEPENDEND_LIBS}
67-
)
68-
if(pfasst_WITH_GCC_PROF AND ${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
69-
set_target_properties(${test}
70-
PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS} -ftest-coverage -fprofile-arcs"
71-
LINK_FLAGS "-fprofile-arcs"
72-
)
73-
endif()
74-
add_test(NAME ${test}
75-
COMMAND ${CMAKE_BINARY_DIR}/tests/examples/advection_diffusion/${test} --gtest_output=xml:${test}_out.xml
47+
set(TESTS
48+
test_advection_diffusion
49+
)
50+
51+
foreach(test ${TESTS})
52+
message(STATUS " ${test}")
53+
add_executable(${test} ${test}.cpp)
54+
if(NOT FFTW_FOUND)
55+
add_dependencies(${test} fftw3)
56+
endif()
57+
if(${pfasst_NUM_DEPENDEND_TARGETS} GREATER 0)
58+
add_dependencies(${test} ${pfasst_DEPENDEND_TARGETS})
59+
endif()
60+
if(${pfasst_TESTS_NUM_DEPENDEND_TARGETS} GREATER 0)
61+
add_dependencies(${test} ${pfasst_TESTS_DEPENDEND_TARGETS})
62+
endif()
63+
target_link_libraries(${test}
64+
${3rdparty_DEPENDEND_LIBS}
65+
${TESTS_3rdparty_DEPENDEND_LIBS}
66+
${FFTW_LIBRARIES}
67+
${pfasst_DEPENDEND_LIBS}
68+
)
69+
if(pfasst_WITH_GCC_PROF AND ${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
70+
set_target_properties(${test}
71+
PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS} -ftest-coverage -fprofile-arcs"
72+
LINK_FLAGS "-fprofile-arcs"
7673
)
77-
endforeach(test)
78-
endif()
74+
endif()
75+
add_test(NAME ${test}
76+
COMMAND ${CMAKE_BINARY_DIR}/tests/examples/advection_diffusion/${test} --gtest_output=xml:${test}_out.xml
77+
)
78+
endforeach(test)

‎tests/examples/boris/CMakeLists.txt‎

Lines changed: 29 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -4,37 +4,35 @@ include_directories(
44
${pfasst_INCLUDES}
55
)
66

7-
if(NOT ${pfasst_WITH_MPI})
8-
set(TESTS
9-
test_boris_particle_util
10-
# test_boris_physics
11-
test_boris_sweeper
12-
)
7+
set(TESTS
8+
test_boris_particle_util
9+
# test_boris_physics
10+
test_boris_sweeper
11+
)
1312

14-
foreach(test ${TESTS})
15-
message(STATUS " ${test}")
16-
add_executable(${test} ${test}.cpp)
17-
if(${pfasst_NUM_DEPENDEND_TARGETS} GREATER 0)
18-
add_dependencies(${test} ${pfasst_DEPENDEND_TARGETS})
19-
endif()
20-
if(${pfasst_TESTS_NUM_DEPENDEND_TARGETS} GREATER 0)
21-
add_dependencies(${test} ${pfasst_TESTS_DEPENDEND_TARGETS})
22-
endif()
23-
target_link_libraries(${test}
24-
${3rdparty_DEPENDEND_LIBS}
25-
${TESTS_3rdparty_DEPENDEND_LIBS}
26-
${pfasst_DEPENDEND_LIBS}
27-
)
28-
if(pfasst_WITH_GCC_PROF AND ${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
29-
set_target_properties(${test}
30-
PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS} -ftest-coverage -fprofile-arcs"
31-
LINK_FLAGS "-fprofile-arcs"
32-
)
33-
endif()
34-
add_test(NAME ${test}
35-
COMMAND ${CMAKE_BINARY_DIR}/tests/examples/boris/${test} --gtest_output=xml:${test}_out.xml
13+
foreach(test ${TESTS})
14+
message(STATUS " ${test}")
15+
add_executable(${test} ${test}.cpp)
16+
if(${pfasst_NUM_DEPENDEND_TARGETS} GREATER 0)
17+
add_dependencies(${test} ${pfasst_DEPENDEND_TARGETS})
18+
endif()
19+
if(${pfasst_TESTS_NUM_DEPENDEND_TARGETS} GREATER 0)
20+
add_dependencies(${test} ${pfasst_TESTS_DEPENDEND_TARGETS})
21+
endif()
22+
target_link_libraries(${test}
23+
${3rdparty_DEPENDEND_LIBS}
24+
${TESTS_3rdparty_DEPENDEND_LIBS}
25+
${pfasst_DEPENDEND_LIBS}
26+
)
27+
if(pfasst_WITH_GCC_PROF AND ${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
28+
set_target_properties(${test}
29+
PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS} -ftest-coverage -fprofile-arcs"
30+
LINK_FLAGS "-fprofile-arcs"
3631
)
37-
endforeach(test)
32+
endif()
33+
add_test(NAME ${test}
34+
COMMAND ${CMAKE_BINARY_DIR}/tests/examples/boris/${test} --gtest_output=xml:${test}_out.xml
35+
)
36+
endforeach(test)
3837

39-
target_link_libraries(test_boris_sweeper simple_physics_solver)
40-
endif()
38+
target_link_libraries(test_boris_sweeper simple_physics_solver)

‎tests/examples/scalar/CMakeLists.txt‎

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -5,34 +5,32 @@ include_directories(
55
${pfasst_INCLUDES}
66
)
77

8-
if(NOT ${pfasst_WITH_MPI})
9-
set(TESTS
10-
test_scalar_conv
11-
test_scalar_highprec
12-
)
8+
set(TESTS
9+
test_scalar_conv
10+
test_scalar_highprec
11+
)
1312

14-
foreach(test ${TESTS})
15-
message(STATUS " ${test}")
16-
add_executable(${test} ${test}.cpp)
17-
if(${pfasst_NUM_DEPENDEND_TARGETS} GREATER 0)
18-
add_dependencies(${test} ${pfasst_DEPENDEND_TARGETS})
19-
endif()
20-
if(${pfasst_TESTS_NUM_DEPENDEND_TARGETS} GREATER 0)
21-
add_dependencies(${test} ${pfasst_TESTS_DEPENDEND_TARGETS})
22-
endif()
23-
target_link_libraries(${test}
24-
${3rdparty_DEPENDEND_LIBS}
25-
${TESTS_3rdparty_DEPENDEND_LIBS}
26-
${pfasst_DEPENDEND_LIBS}
27-
)
28-
if(pfasst_WITH_GCC_PROF AND ${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
29-
set_target_properties(${test}
30-
PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS} -ftest-coverage -fprofile-arcs"
31-
LINK_FLAGS "-fprofile-arcs"
32-
)
33-
endif()
34-
add_test(NAME ${test}
35-
COMMAND ${CMAKE_BINARY_DIR}/tests/examples/scalar/${test} --gtest_output=xml:${test}_out.xml
13+
foreach(test ${TESTS})
14+
message(STATUS " ${test}")
15+
add_executable(${test} ${test}.cpp)
16+
if(${pfasst_NUM_DEPENDEND_TARGETS} GREATER 0)
17+
add_dependencies(${test} ${pfasst_DEPENDEND_TARGETS})
18+
endif()
19+
if(${pfasst_TESTS_NUM_DEPENDEND_TARGETS} GREATER 0)
20+
add_dependencies(${test} ${pfasst_TESTS_DEPENDEND_TARGETS})
21+
endif()
22+
target_link_libraries(${test}
23+
${3rdparty_DEPENDEND_LIBS}
24+
${TESTS_3rdparty_DEPENDEND_LIBS}
25+
${pfasst_DEPENDEND_LIBS}
26+
)
27+
if(pfasst_WITH_GCC_PROF AND ${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
28+
set_target_properties(${test}
29+
PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS} -ftest-coverage -fprofile-arcs"
30+
LINK_FLAGS "-fprofile-arcs"
3631
)
37-
endforeach(test)
38-
endif()
32+
endif()
33+
add_test(NAME ${test}
34+
COMMAND ${CMAKE_BINARY_DIR}/tests/examples/scalar/${test} --gtest_output=xml:${test}_out.xml
35+
)
36+
endforeach(test)

‎tests/examples/vanderpol/CMakeLists.txt‎

Lines changed: 26 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5,33 +5,31 @@ include_directories(
55
${pfasst_INCLUDES}
66
)
77

8-
if(NOT ${pfasst_WITH_MPI})
9-
set(TESTS
10-
test_vdp_zeronu_conv
11-
)
8+
set(TESTS
9+
test_vdp_zeronu_conv
10+
)
1211

13-
foreach(test ${TESTS})
14-
message(STATUS " ${test}")
15-
add_executable(${test} ${test}.cpp)
16-
if(${pfasst_NUM_DEPENDEND_TARGETS} GREATER 0)
17-
add_dependencies(${test} ${pfasst_DEPENDEND_TARGETS})
18-
endif()
19-
if(${pfasst_TESTS_NUM_DEPENDEND_TARGETS} GREATER 0)
20-
add_dependencies(${test} ${pfasst_TESTS_DEPENDEND_TARGETS})
21-
endif()
22-
target_link_libraries(${test}
23-
${3rdparty_DEPENDEND_LIBS}
24-
${TESTS_3rdparty_DEPENDEND_LIBS}
25-
${pfasst_DEPENDEND_LIBS}
26-
)
27-
if(pfasst_WITH_GCC_PROF AND ${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
28-
set_target_properties(${test}
29-
PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS} -ftest-coverage -fprofile-arcs"
30-
LINK_FLAGS "-fprofile-arcs"
31-
)
32-
endif()
33-
add_test(NAME ${test}
34-
COMMAND ${CMAKE_BINARY_DIR}/tests/examples/vanderpol/${test} --gtest_output=xml:${test}_out.xml
12+
foreach(test ${TESTS})
13+
message(STATUS " ${test}")
14+
add_executable(${test} ${test}.cpp)
15+
if(${pfasst_NUM_DEPENDEND_TARGETS} GREATER 0)
16+
add_dependencies(${test} ${pfasst_DEPENDEND_TARGETS})
17+
endif()
18+
if(${pfasst_TESTS_NUM_DEPENDEND_TARGETS} GREATER 0)
19+
add_dependencies(${test} ${pfasst_TESTS_DEPENDEND_TARGETS})
20+
endif()
21+
target_link_libraries(${test}
22+
${3rdparty_DEPENDEND_LIBS}
23+
${TESTS_3rdparty_DEPENDEND_LIBS}
24+
${pfasst_DEPENDEND_LIBS}
25+
)
26+
if(pfasst_WITH_GCC_PROF AND ${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
27+
set_target_properties(${test}
28+
PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS} -ftest-coverage -fprofile-arcs"
29+
LINK_FLAGS "-fprofile-arcs"
3530
)
36-
endforeach(test)
37-
endif()
31+
endif()
32+
add_test(NAME ${test}
33+
COMMAND ${CMAKE_BINARY_DIR}/tests/examples/vanderpol/${test} --gtest_output=xml:${test}_out.xml
34+
)
35+
endforeach(test)

0 commit comments

Comments
 (0)