From 546cdb7671fe60b65560fe913dee65039855de8a Mon Sep 17 00:00:00 2001
From: dekken <philip.deegan@gmail.com>
Date: Mon, 2 Nov 2020 14:13:31 +0100
Subject: [PATCH 1/4] AMR Field Refine: extract some tests to be only run under
 serial execution

---
 tests/amr/data/field/refine/CMakeLists.txt    | 37 +++++++++++--------
 .../test_field_refinement_on_hierarchy.cpp    | 27 ++++++++++++++
 2 files changed, 49 insertions(+), 15 deletions(-)

diff --git a/tests/amr/data/field/refine/CMakeLists.txt b/tests/amr/data/field/refine/CMakeLists.txt
index 0fa6f6dec..20b9602ce 100644
--- a/tests/amr/data/field/refine/CMakeLists.txt
+++ b/tests/amr/data/field/refine/CMakeLists.txt
@@ -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)
diff --git a/tests/amr/data/field/refine/test_field_refinement_on_hierarchy.cpp b/tests/amr/data/field/refine/test_field_refinement_on_hierarchy.cpp
index c30bb8557..8c4ddc314 100644
--- a/tests/amr/data/field/refine/test_field_refinement_on_hierarchy.cpp
+++ b/tests/amr/data/field/refine/test_field_refinement_on_hierarchy.cpp
@@ -129,3 +129,30 @@ TYPED_TEST(ALinearFieldRefineTest, ConserveLinearFunction)
         }
     }
 }
+
+
+
+
+INSTANTIATE_TEST_SUITE_P(WithRatioFrom2To10TestThat, ALinearFieldRefine1DO1,
+                         ::testing::Values(2, 3, 4, 5, 6, 7, 8, 9, 10));
+
+
+
+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;
+}

From ad83cc5013e084268d921f51e917718c26e4b952 Mon Sep 17 00:00:00 2001
From: dekken <philip.deegan@gmail.com>
Date: Mon, 2 Nov 2020 14:19:49 +0100
Subject: [PATCH 2/4] AMR Field Overlap: refactor tests to be only run under
 serial execution

---
 tests/amr/data/field/overlap/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/amr/data/field/overlap/CMakeLists.txt b/tests/amr/data/field/overlap/CMakeLists.txt
index 61ca6db76..e6563f64c 100644
--- a/tests/amr/data/field/overlap/CMakeLists.txt
+++ b/tests/amr/data/field/overlap/CMakeLists.txt
@@ -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})
 
 

From 66aa0a8b690bbe43f326c86028f7f75d2566ff16 Mon Sep 17 00:00:00 2001
From: dekken <philip.deegan@gmail.com>
Date: Mon, 8 Mar 2021 11:07:59 +0100
Subject: [PATCH 3/4] AMR Field Time Interpolate: refactor tests to be only run
 under serial execution

---
 .../field/refine/test_field_refinement_on_hierarchy.cpp     | 6 ------
 tests/amr/data/field/time_interpolate/CMakeLists.txt        | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/tests/amr/data/field/refine/test_field_refinement_on_hierarchy.cpp b/tests/amr/data/field/refine/test_field_refinement_on_hierarchy.cpp
index 8c4ddc314..a0e299f2c 100644
--- a/tests/amr/data/field/refine/test_field_refinement_on_hierarchy.cpp
+++ b/tests/amr/data/field/refine/test_field_refinement_on_hierarchy.cpp
@@ -132,12 +132,6 @@ TYPED_TEST(ALinearFieldRefineTest, ConserveLinearFunction)
 
 
 
-
-INSTANTIATE_TEST_SUITE_P(WithRatioFrom2To10TestThat, ALinearFieldRefine1DO1,
-                         ::testing::Values(2, 3, 4, 5, 6, 7, 8, 9, 10));
-
-
-
 int main(int argc, char** argv)
 {
     ::testing::InitGoogleTest(&argc, argv);
diff --git a/tests/amr/data/field/time_interpolate/CMakeLists.txt b/tests/amr/data/field/time_interpolate/CMakeLists.txt
index 29517bbda..0891d1258 100644
--- a/tests/amr/data/field/time_interpolate/CMakeLists.txt
+++ b/tests/amr/data/field/time_interpolate/CMakeLists.txt
@@ -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})
 
 
 

From 9171647285a66dcaa6b7253ebb11b1cad063fe24 Mon Sep 17 00:00:00 2001
From: dekken <philip.deegan@gmail.com>
Date: Tue, 27 Apr 2021 14:35:20 +0200
Subject: [PATCH 4/4] AMR: rm tests from MPI suite

---
 tests/amr/data/field/coarsening/CMakeLists.txt       | 3 ++-
 tests/amr/data/field/variable/CMakeLists.txt         | 2 +-
 tests/amr/data/particles/copy/CMakeLists.txt         | 2 +-
 tests/amr/data/particles/copy_overlap/CMakeLists.txt | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/tests/amr/data/field/coarsening/CMakeLists.txt b/tests/amr/data/field/coarsening/CMakeLists.txt
index c73804e24..5a43da082 100644
--- a/tests/amr/data/field/coarsening/CMakeLists.txt
+++ b/tests/amr/data/field/coarsening/CMakeLists.txt
@@ -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})
diff --git a/tests/amr/data/field/variable/CMakeLists.txt b/tests/amr/data/field/variable/CMakeLists.txt
index 467260b3f..33cf3f447 100644
--- a/tests/amr/data/field/variable/CMakeLists.txt
+++ b/tests/amr/data/field/variable/CMakeLists.txt
@@ -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})
 
 
diff --git a/tests/amr/data/particles/copy/CMakeLists.txt b/tests/amr/data/particles/copy/CMakeLists.txt
index d8356b624..89b6b1fe5 100644
--- a/tests/amr/data/particles/copy/CMakeLists.txt
+++ b/tests/amr/data/particles/copy/CMakeLists.txt
@@ -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})
 
 
diff --git a/tests/amr/data/particles/copy_overlap/CMakeLists.txt b/tests/amr/data/particles/copy_overlap/CMakeLists.txt
index 8fc9082e9..6b9d35ca1 100644
--- a/tests/amr/data/particles/copy_overlap/CMakeLists.txt
+++ b/tests/amr/data/particles/copy_overlap/CMakeLists.txt
@@ -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})