Shorten teams_subset test; refactor to use assert

Author: Damian Rouson

src/tests/unit/teams/CMakeLists.txt

@@ -1,3 +1,4 @@
 caf_compile_executable(team_number team-number.f90)
 caf_compile_executable(teams_subset teams_subset.f90)
+target_link_libraries(teams_subset opencoarrays_test_utilities)
 caf_compile_executable(get_communicator get-communicator.f90)

src/tests/unit/teams/teams_subset.f90

@@ -1,35 +1,36 @@
 program teams_subset
+  !! author: Nathan Weeks
+  !!
+  !! Regression test for prior potential deadlock in change team/end team
   use iso_fortran_env, only : team_type
+  use assertions_interface, only : assert
   implicit none
 
-  type(team_type) :: team
-  integer :: initial_team_image, max_image(2), min_image(2), myteam
-
-  initial_team_image = this_image()
-
-  if (initial_team_image == 1 .or. initial_team_image == num_images()) then
-    myteam = 1
-  else
-    myteam = 2
-  end if
-
-  form team (myteam, team)
-
-  if (myteam == 1) then
-    change team(team)
-      max_image = [initial_team_image, this_image()]
-      call co_max(max_image)
-      min_image = [initial_team_image, this_image()]
-      call co_min(min_image)
-    end team
-    if (any(min_image /= [1, 1]) .or. any(max_image /= [num_images(), 2])) then
-      write(*,*) "Test failed."
-      error stop
+  type(team_type) team
+
+  associate( initial_team_image => this_image())
+  associate( myteam => merge(1,2,any(initial_team_image==[1,num_images()]) )
+
+    form team (myteam, team)
+
+    if (myteam == 1) then
+      block
+        integer max_image(2), min_image(2)
+        change team(team)
+          max_image = [initial_team_image, this_image()]
+          call co_max(max_image)
+          min_image = [initial_team_image, this_image()]
+          call co_min(min_image)
+        end team
+        call assert( all(min_image==1), "team minimum image number is 1" )
+        call assert( all(max_image==[num_images(), 2]), "team maximum images numbers is num_images() or 2")
+      end block
     end if
-  end if
 
-  sync all
+    sync all
 
-  if (initial_team_image == 1) write(*,*) "Test passed."
+    if (initial_team_image == 1) print *,"Test passed."
+
+  end associate; end associate
 
 end program

src/tests/utilities/CMakeLists.txt

@@ -1,4 +1,9 @@
-# Check support Fortran 2018 error termination in a pure procedure
+if ("${CMAKE_Fortran_COMPILER_ID}" MATCHES "GNU" )
+  set(OLD_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
+  set(CMAKE_REQUIRED_FLAGS "-fcoarray=single -ffree-form")
+endif()
+
+# Check support for Fortran 2018 error termination in a pure procedure
 check_fortran_source_compiles("
   program main
   contains
@@ -14,7 +19,7 @@ if(HAVE_ERROR_STOP_IN_PURE)
   add_definitions(-DHAVE_ERROR_STOP_IN_PURE)
 endif()
 
-# Check support Fortran 2018 variable stop code
+# Check support for Fortran 2018 variable stop code
 check_fortran_source_compiles("
   program main
     integer i
@@ -28,16 +33,23 @@ if(HAVE_VARIABLE_STOP_CODE)
   add_definitions(-DHAVE_VARIABLE_STOP_CODE)
 endif()
 
+if ("${CMAKE_Fortran_COMPILER_ID}" MATCHES "GNU" )
+  set(CMAKE_REQUIRED_FLAGS ${OLD_REQUIRED_FLAGS})
+endif()
+
 #Toggle C preprocessor macro for turning assertions on or off
 if(NO_ASSERTIONS)
-  set_source_files_properties(assertions_interface.f90 PROPERTIES COMPILE_FLAGS "-cpp -DUSE_ASSERTIONS=.false.")
+  target_compile_definitions( opencoarrays_test_utilities
+    PUBLIC "-DUSE_ASSERTIONS=.false."
+  )
 else()
-  set_source_files_properties(assertions_interface.f90 PROPERTIES COMPILE_FLAGS "-cpp -DUSE_ASSERTIONS=.true.")
+  target_compile_definitions( opencoarrays_test_utilities
+    PUBLIC "-DUSE_ASSERTIONS=.true."
+  )
 endif()
 
-add_library( OpenCoarraysTestUtilities
+add_library( opencoarrays_test_utilities
   object_interface.f90
   assertions_interface.F90
   assertions_implementation.F90
 )
-