Skip to content

Commit

Permalink
Refactor some tests to be only run under serial execution (PHAREHUB#376)
Browse files Browse the repository at this point in the history
* AMR Field Refine: extract some tests to be only run under serial execution
* AMR Field Overlap: refactor tests to be only run under serial execution
* AMR Field Time Interpolate: refactor tests to be only run under serial execution
* AMR: rm tests from MPI suite
  • Loading branch information
PhilipDeegan committed Nov 30, 2023
1 parent 4d23de0 commit e553fad
Show file tree
Hide file tree
Showing 8 changed files with 50 additions and 21 deletions.
3 changes: 2 additions & 1 deletion tests/amr/data/field/coarsening/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,9 @@ target_link_libraries(${PROJECT_NAME} PRIVATE
phare_amr
${GTEST_LIBS})


add_custom_command(TARGET ${PROJECT_NAME}
PRE_BUILD
COMMAND "PYTHONPATH=${CMAKE_BINARY_DIR}:${PHARE_PYTHONPATH}" ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test_coarsen_field.py ${CMAKE_CURRENT_BINARY_DIR})

add_phare_test(${PROJECT_NAME} ${CMAKE_CURRENT_BINARY_DIR})
add_no_mpi_phare_test(${PROJECT_NAME} ${CMAKE_CURRENT_BINARY_DIR})
2 changes: 1 addition & 1 deletion tests/amr/data/field/overlap/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ target_include_directories(${PROJECT_NAME} PRIVATE

target_link_libraries(${PROJECT_NAME} PRIVATE ${SAMRAI_LIBRARIES})

add_phare_test(${PROJECT_NAME} ${CMAKE_CURRENT_BINARY_DIR})
add_no_mpi_phare_test(${PROJECT_NAME} ${CMAKE_CURRENT_BINARY_DIR})


37 changes: 22 additions & 15 deletions tests/amr/data/field/refine/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,28 +15,35 @@ set(SOURCES_INC
${CMAKE_CURRENT_BINARY_DIR}/input_config.h
)

set(SOURCES_CPP
test_field_refinement_on_hierarchy.cpp
test_field_refine.cpp)
function(_setup_amr_field_refine_test src_name)

add_executable(${PROJECT_NAME} ${SOURCES_INC} ${SOURCES_CPP})
add_executable(${src_name} ${SOURCES_INC} ${src_name}.cpp)

target_include_directories(${PROJECT_NAME} PRIVATE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
${GTEST_INCLUDE_DIRS}
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
target_include_directories(${src_name} PRIVATE
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
${GTEST_INCLUDE_DIRS}
)

target_link_libraries(${PROJECT_NAME} PRIVATE
phare_amr
${GTEST_LIBS})
target_link_libraries(${src_name} PRIVATE phare_amr ${GTEST_LIBS})

target_include_directories(${src_name} PRIVATE
$<BUILD_INTERFACE:${SAMRAI_INCLUDE_DIRS}>)

target_include_directories(${PROJECT_NAME} PRIVATE
$<BUILD_INTERFACE:${SAMRAI_INCLUDE_DIRS}>)
target_link_libraries(${src_name} PRIVATE ${SAMRAI_LIBRARIES})

target_link_libraries(${PROJECT_NAME} PRIVATE ${SAMRAI_LIBRARIES})
endfunction(_setup_amr_field_refine_test)

add_phare_test(${PROJECT_NAME} ${CMAKE_CURRENT_BINARY_DIR})

function(_add_general_amr_field_refine_test src_name)
_setup_amr_field_refine_test(${src_name})
add_phare_test(${src_name} ${CMAKE_CURRENT_BINARY_DIR})
endfunction(_add_general_amr_field_refine_test)

function(_add_serial_amr_field_refine_test src_name)
_setup_amr_field_refine_test(${src_name})
add_no_mpi_phare_test(${src_name} ${CMAKE_CURRENT_BINARY_DIR})
endfunction(_add_serial_amr_field_refine_test)


_add_general_amr_field_refine_test(test_field_refinement_on_hierarchy)
_add_serial_amr_field_refine_test(test_field_refine)
21 changes: 21 additions & 0 deletions tests/amr/data/field/refine/test_field_refinement_on_hierarchy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -129,3 +129,24 @@ TYPED_TEST(ALinearFieldRefineTest, ConserveLinearFunction)
}
}
}



int main(int argc, char** argv)
{
::testing::InitGoogleTest(&argc, argv);

SAMRAI::tbox::SAMRAI_MPI::init(&argc, &argv);
SAMRAI::tbox::SAMRAIManager::initialize();
SAMRAI::tbox::SAMRAIManager::startup();


int testResult = RUN_ALL_TESTS();

// Finalize
SAMRAI::tbox::SAMRAIManager::shutdown();
SAMRAI::tbox::SAMRAIManager::finalize();
SAMRAI::tbox::SAMRAI_MPI::finalize();

return testResult;
}
2 changes: 1 addition & 1 deletion tests/amr/data/field/time_interpolate/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ target_link_libraries(${PROJECT_NAME} PRIVATE
${GTEST_LIBS})


add_phare_test(${PROJECT_NAME} ${CMAKE_CURRENT_BINARY_DIR})
add_no_mpi_phare_test(${PROJECT_NAME} ${CMAKE_CURRENT_BINARY_DIR})



2 changes: 1 addition & 1 deletion tests/amr/data/field/variable/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ target_include_directories(${PROJECT_NAME} PRIVATE

target_link_libraries(${PROJECT_NAME} PRIVATE ${SAMRAI_LIBRARIES})

add_phare_test(${PROJECT_NAME} ${CMAKE_CURRENT_BINARY_DIR})
add_no_mpi_phare_test(${PROJECT_NAME} ${CMAKE_CURRENT_BINARY_DIR})


2 changes: 1 addition & 1 deletion tests/amr/data/particles/copy/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ target_link_libraries(${PROJECT_NAME} PRIVATE
${GTEST_LIBS})


add_phare_test(${PROJECT_NAME} ${CMAKE_CURRENT_BINARY_DIR})
add_no_mpi_phare_test(${PROJECT_NAME} ${CMAKE_CURRENT_BINARY_DIR})


2 changes: 1 addition & 1 deletion tests/amr/data/particles/copy_overlap/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ target_link_libraries(${PROJECT_NAME} PRIVATE
${GTEST_LIBS})


add_phare_test(${PROJECT_NAME} ${CMAKE_CURRENT_BINARY_DIR})
add_no_mpi_phare_test(${PROJECT_NAME} ${CMAKE_CURRENT_BINARY_DIR})


0 comments on commit e553fad

Please sign in to comment.