Merge branch 'vehre/issue-260-async-alloc-and-is-present' of github.com:sourceryinstitute/opencoarrays into vehre/issue-260-async-alloc-and-is-present

Author: vehre

CMakeLists.txt

@@ -9,7 +9,6 @@ set_property ( CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS ${CMAKE_CONFIGURATION_TYP
 # Add option and check environment to determine if developer tests should be run
 if($ENV{OPENCOARRAYS_DEVELOPER})
   option(CAF_RUN_DEVELOPER_TESTS "Run tests intended only for developers" ON)
-  message( STATUS "OpenCoarrays developer tests turned on")
 else()
   option(CAF_RUN_DEVELOPER_TESTS "Run tests intended only for developers" OFF)
 endif()
@@ -528,7 +527,7 @@ set(tests_root ${CMAKE_CURRENT_BINARY_DIR}/src/tests)
 
 
 if(opencoarrays_aware_compiler)
-  if (RUN_DEVELOPER_TESTS)
+  if (CAF_RUN_DEVELOPER_TESTS OR $ENV{OPENCOARRAYS_DEVELOPER})
     message ( STATUS "Running Developer tests is enabled." )
   endif()
   # Unit tests targeting each libcaf_mpi function, argument, and branch of code
@@ -537,7 +536,7 @@ if(opencoarrays_aware_compiler)
   add_mpi_test(register_vector 2 ${tests_root}/unit/init_register/register_vector)
   add_mpi_test(register_alloc_vector 2 ${tests_root}/unit/init_register/register_alloc_vector)
   add_mpi_test(allocate_as_barrier 2 ${tests_root}/unit/init_register/allocate_as_barrier)
-  add_mpi_test(allocate_as_barrier_proc 32 ${tests_root}/unit/init_register/allocate_as_barrier_proc)
+  add_mpi_test(allocate_as_barrier_proc 8 ${tests_root}/unit/init_register/allocate_as_barrier_proc)
   if (gfortran_compiler AND (NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 7))
     add_mpi_test(register_alloc_comp_1 2 ${tests_root}/unit/init_register/register_alloc_comp_1)
     add_mpi_test(register_alloc_comp_2 2 ${tests_root}/unit/init_register/register_alloc_comp_2)
@@ -555,16 +554,16 @@ if(opencoarrays_aware_compiler)
   add_mpi_test(co_broadcast 4 ${tests_root}/unit/collectives/co_broadcast_test)
   add_mpi_test(co_min 4 ${tests_root}/unit/collectives/co_min_test)
   add_mpi_test(co_max 4 ${tests_root}/unit/collectives/co_max_test)
-  add_mpi_test(syncall 32 ${tests_root}/unit/sync/syncall)
-  add_mpi_test(syncimages 32 ${tests_root}/unit/sync/syncimages)
-  add_mpi_test(syncimages2 32 ${tests_root}/unit/sync/syncimages2)
+  add_mpi_test(syncall 8 ${tests_root}/unit/sync/syncall)
+  add_mpi_test(syncimages 8 ${tests_root}/unit/sync/syncimages)
+  add_mpi_test(syncimages2 8 ${tests_root}/unit/sync/syncimages2)
   add_mpi_test(duplicate_syncimages 8 ${tests_root}/unit/sync/duplicate_syncimages)
   add_mpi_test(co_reduce 4 ${tests_root}/unit/collectives/co_reduce_test)
   add_mpi_test(co_reduce_res_im 4 ${tests_root}/unit/collectives/co_reduce_res_im)
-  add_mpi_test(syncimages_status 32 ${tests_root}/unit/sync/syncimages_status)
+  add_mpi_test(syncimages_status 8 ${tests_root}/unit/sync/syncimages_status)
   add_mpi_test(sync_ring_abort_np3 3 ${tests_root}/unit/sync/sync_image_ring_abort_on_stopped_image)
   add_mpi_test(sync_ring_abort_np7 7 ${tests_root}/unit/sync/sync_image_ring_abort_on_stopped_image)
-  add_mpi_test(simpleatomics 32 ${tests_root}/unit/simple/atomics)
+  add_mpi_test(simpleatomics 8 ${tests_root}/unit/simple/atomics)
   # possible logic error in the following test
 #  add_mpi_test(increment_my_neighbor 32 ${tests_root}/unit/simple/increment_my_neighbor)