Fix team_number test.

Author: vehre

CMakeLists.txt

@@ -803,6 +803,7 @@ if(opencoarrays_aware_compiler)
     add_caf_test(comp_allocated_2 2 comp_allocated_2)
     add_caf_test(alloc_comp_get_convert_nums 2 alloc_comp_get_convert_nums)
     if(NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 8)
+      add_caf_test(team_number 8 team_number)
       add_caf_test(teams_subset 3 teams_subset)
       add_caf_test(get_communicator 3  get_communicator)
       add_caf_test(teams_coarray_get 5 teams_coarray_get)
@@ -815,11 +816,8 @@ if(opencoarrays_aware_compiler)
       set_tests_properties(alloc_comp_multidim_shape PROPERTIES TIMEOUT 300)
     endif()
     if(NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 15)
-        add_caf_test(team_number 8 team_number)
         add_caf_test(teams_this_image 8 teams_this_image)
         add_caf_test(teams_num_images 8 teams_num_images)
-    else()
-        add_caf_test(team_number_pre15 8 team_number_pre15)
     endif()
   endif()
 

src/tests/unit/teams/CMakeLists.txt

@@ -1,4 +1,4 @@
-caf_compile_executable(team_number_pre15 team_number_pre15.f90)
+caf_compile_executable(team_number team_number.F90)
 caf_compile_executable(teams_subset teams_subset.f90)
 caf_compile_executable(get_communicator get-communicator.F90)
 caf_compile_executable(teams_coarray_get teams_coarray_get.f90)
@@ -8,7 +8,6 @@ caf_compile_executable(teams_coarray_send_by_ref teams_coarray_send.f90)
 caf_compile_executable(teams_coarray_sendget teams_coarray_sendget.f90)
 caf_compile_executable(sync_team sync-team.f90)
 if (gfortran_compiler AND (NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 15.0.0))
-    caf_compile_executable(team_number team_number.f90)
     caf_compile_executable(teams_this_image teams_this_image.f90)
     caf_compile_executable(teams_num_images teams_num_images.f90)
 endif()

src/tests/unit/teams/team_number.f90 renamed to src/tests/unit/teams/team_number.F90

@@ -29,7 +29,7 @@
 ! OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 program main
   !! summary: Test team_number intrinsic function
-  use iso_fortran_env, only : team_type, current_team
+  use, intrinsic :: iso_fortran_env
   use iso_c_binding, only : c_loc
   use oc_assertions_interface, only : assert
 
@@ -43,7 +43,9 @@ program main
 
   call assert(team_number()==standard_initial_value,"initial team number conforms with Fortran standard before 'change team'")
 
+#ifdef GCC_GE_15
   call assert(team_number(get_team(current_team))==standard_initial_value,"initial team number conforms with Fortran standard before 'change team'")
+#endif
 
   after_change_team: block
     associate(parent_team_number => 100 + (num_images()-1)/4, child_team_number => 1000 + mod(num_images()-1,4)/2)