Revise team tests and add team_number test

Author: Damian Rouson

gcc/testsuite/gfortran.dg/team_change_1.f90

@@ -5,11 +5,8 @@
 !
   use iso_fortran_env, only : team_type
   implicit none
-  type(team_type) :: team
-  integer :: new_team
-  integer, parameter :: standard_initial_value=-1
-
-  if (team_number()/=standard_initial_value) call abort
+  type(team_type) team
+  integer new_team
 
   new_team = mod(this_image(),2)+1
 
@@ -18,5 +15,4 @@
     if (team_number()/=new_team) call abort
   end team
 
-  if (team_number()/=standard_initial_value) call abort
 end

gcc/testsuite/gfortran.dg/team_end_1.f90

@@ -1,18 +1,18 @@
 ! { dg-do run }
 ! { dg-options "-fcoarray=single" }
 !
-! Tests if end team reverts this_image value
+! Tests if team_number intrinsic fucntion works
 !
   use iso_fortran_env, only : team_type
   implicit none
   type(team_type) :: team
-  integer :: orig_i
-
-  orig_i = this_image ()
-  form team (orig_i + 1,team)
-  change team (team)
-  end team
-  if ( orig_i .NE. this_image () ) call abort
-end
+  integer, parameter :: standard_initial_value=-1
 
+  associate(new_team => mod(this_image(),2)+1)
+    form team (new_team,team)
+      change team (team)
+    end team
+  end associate
 
+  if (team_number()/=standard_initial_value) call abort
+end

gcc/testsuite/gfortran.dg/team_form_1.f90

@@ -1,12 +1,14 @@
 ! { dg-do run }
 ! { dg-options "-fcoarray=single" }
 !
+! Tests if form team works
 !
   use iso_fortran_env, only : team_type
   implicit none
   type(team_type) :: team
 
-  form team (this_image(),team)
+  form team (mod(this_image(),2)+1,team)
 end
 
 
+

gcc/testsuite/gfortran.dg/team_number_1.f90

@@ -0,0 +1,21 @@
+! { dg-do run }
+! { dg-options "-fcoarray=single" }
+!
+! Tests if team_number intrinsic fucntion works
+!
+  use iso_fortran_env, only : team_type
+  implicit none
+  type(team_type) team
+  integer, parameter :: standard_initial_value=-1
+  integer new_team
+
+  if (team_number()/=standard_initial_value) call abort
+
+  new_team = mod(this_image(),2)+1
+  form team (new_team,team)
+    change team (team)
+    if (team_number()/=new_team) call abort
+  end team
+
+  if (team_number()/=standard_initial_value) call abort
+end