Update tests with MIN_IMAGES property

zbeekman · zbeekman · commit 95093f34017d · 2017-11-10T16:19:58.000-05:00
- Fixes #461 (hopefully, no good way to test)
diff --git a/src/tests/unit/events/CMakeLists.txt b/src/tests/unit/events/CMakeLists.txt
@@ -1,2 +1,8 @@
 caf_compile_executable(allocatable_p2p_event_post allocatable_p2p_event_post.f90)
+set_target_properties(build_allocatable_p2p_event_post
+  PROPERTIES MIN_IMAGES 4
+  )
 caf_compile_executable(static_event_post_issue_293 static_event_post_issue_293.f90)
+set_target_properties(build_static_event_post_issue_293
+  PROPERTIES MIN_IMAGES 3
+  )
diff --git a/src/tests/unit/fail_images/CMakeLists.txt b/src/tests/unit/fail_images/CMakeLists.txt
@@ -10,3 +10,12 @@ caf_compile_executable(image_fail_and_status_test_1 image_fail_and_status_test_1
 caf_compile_executable(image_fail_and_get_test_1 image_fail_and_get_test_1.f90)
 caf_compile_executable(image_fail_and_failed_images_test_1 image_fail_and_failed_images_test_1.f90)
 caf_compile_executable(image_fail_and_stopped_images_test_1 image_fail_and_stopped_images_test_1.f90)
+set_target_properties(build_image_fail_test_1
+  build_image_fail_and_sync_test_1
+  build_image_fail_and_sync_test_2
+  build_image_fail_and_sync_test_3
+  build_image_fail_and_status_test_1
+  build_image_fail_and_get_test_1
+  build_image_fail_and_failed_images_test_1
+  build_image_fail_and_stopped_images_test_1
+  PROPERTIES MIN_IMAGES 3)
diff --git a/src/tests/unit/init_register/CMakeLists.txt b/src/tests/unit/init_register/CMakeLists.txt
@@ -1,12 +1,16 @@
 caf_compile_executable(initialize_mpi initialize_mpi.F90)
 caf_compile_executable(register register.f90)
+set_target_properties(build_register
+  PROPERTIES MIN_IMAGES 2)
 caf_compile_executable(register_vector register_vector.f90)
 caf_compile_executable(register_alloc_vector register_alloc_vector.f90)
 caf_compile_executable(allocate_as_barrier allocate_as_barrier.f90)
 caf_compile_executable(allocate_as_barrier_proc allocate_as_barrier_proc.f90)
 
 if (gfortran_compiler AND (NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 7.0.0))
   caf_compile_executable(async_comp_alloc async_comp_alloc.f90)
+  set_target_properties(build_async_comp_alloc
+    PROPERTIES MIN_IMAGES 2)
   caf_compile_executable(async_comp_alloc_2 async_comp_alloc_2.f90)
   caf_compile_executable(register_alloc_comp_1 register_alloc_comp_1.f90)
   caf_compile_executable(register_alloc_comp_2 register_alloc_comp_2.f90)
diff --git a/src/tests/unit/send-get/CMakeLists.txt b/src/tests/unit/send-get/CMakeLists.txt
@@ -9,3 +9,5 @@ caf_compile_executable(get_with_offset_1d get_with_offset_1d.f90)
 caf_compile_executable(whole_get_array whole_get_array.f90)
 caf_compile_executable(strided_get strided_get.f90)
 caf_compile_executable(strided_sendget strided_sendget.f90)
+set_target_properties(build_strided_sendget
+  PROPERTIES MIN_IMAGES 3)
diff --git a/src/tests/unit/sync/CMakeLists.txt b/src/tests/unit/sync/CMakeLists.txt
@@ -4,3 +4,5 @@ caf_compile_executable(syncimages2 syncimages2.f90)
 caf_compile_executable(duplicate_syncimages duplicate_syncimages.f90)
 caf_compile_executable(syncimages_status syncimages_status.f90)
 caf_compile_executable(sync_image_ring_abort_on_stopped_image sync_image_ring_abort_on_stopped_image.f90)
+set_target_properties(build_sync_image_ring_abort_on_stopped_image
+  PROPERTIES MIN_IMAGES 3)
diff --git a/src/tests/unit/sync/sync_image_ring_abort_on_stopped_image.f90 b/src/tests/unit/sync/sync_image_ring_abort_on_stopped_image.f90
@@ -10,7 +10,7 @@ program sync_image_ring_abort_on_stopped_image
 
   integer :: stat_var = 0
 
-  if (num_images() .lt. 2) error stop "Need at least two images to test."
+  if (num_images() .lt. 3) error stop "Need at least three images to test."
 
   associate (me => this_image())
     if (me == 1) then
