[flang] Port test_any.sh tests to FileCheck: Hand port tests which use regexes

[richard.barton.arm]

Summary

The regex syntax used by test_any.sh's FileCheck is sometimes incompatible with
real FileCheck.

Hand port these tests to use FileCheck and it's regex format.

Also remove FIXME from label01 that no longer applies and define a macro
to enable all tests.

[tskeith]

These (D82164-D82168) all look okay to me but someone who understands FileCheck should approve.

With these changes we can remove test_any.sh, right?

[schweitz]

flang/test/Semantics/label01.F90

2

Should there be two (maybe 3?) RUN: lines? One to test STRICT_F18 and another for ARCHAIC_FORTRAN?

[richard.barton.arm]

Added new run line for label01 as per schweitz review.

[richard.barton.arm]

Should there be two (maybe 3?) RUN: lines? One to test STRICT_F18 and another for ARCHAIC_FORTRAN?

Agreed. I have added a line that defines -DSTRICT_F18 and runs with -Mstandard. ARCHAIC_FORTRAN is a superset of the current run line, so I think two run lines should be sufficient.
Note that the test has issues in that it checks for "error:" but the parser diagnostics that are emitted do not start with this. Because of this, the test misses the fact that even without -Mstandard, there is a diagnostic emitted on one of the testcases.
I propose the fix for this test is a separate change.

With these changes we can remove test_any.sh, right?

Agreed. I thought about pushing these in a sequence as one would with a github PR, but figured as they did not actually depend on eachother I would submit them as separate phab reviews. I propose to edit the last commit that gets approved with a git rm on that file.

[schweitz]

In D82164#2106822, @richard.barton.arm wrote:

Note that the test has issues in that it checks for "error:" but the parser diagnostics that are emitted do not start with this. Because of this, the test misses the fact that even without -Mstandard, there is a diagnostic emitted on one of the testcases.
I propose the fix for this test is a separate change.

Sounds good. Hopefully the flang driver will be written to support a -verify-diagnostics mode.

[richard.barton.arm]

I can't see why the pre-commit checks are failing. As they are Beta I propose to ignore them.

[richard.barton.arm]

Ping. @schweitz are you happy to approve?

Also D82165, D82166, D82167 and D82168.

flang/test/Semantics/doconcurrent04.f90

-! RUN: %S/test_any.sh %s %t %f18
 ! C1122 The index-name shall be a named scalar variable of type integer.
-! EXEC: ${F18} -funparse-with-symbols %s 2>&1 | ${FileCheck} %s
-! CHECK: Must have INTEGER type, but is REAL\\(4\\)
+! RUN: not %f18 -funparse-with-symbols %s 2>&1 | FileCheck %s
+! CHECK: Must have INTEGER type, but is REAL(4)
 
 subroutine do_concurrent_test1(n)
   implicit none
   integer :: n
   real :: j
   do 20 concurrent (j = 1:n)
 20 enddo
 end subroutine do_concurrent_test1

flang/test/Semantics/label01.F90

-! RUN: %S/test_any.sh %s %t %f18
-! EXEC: ${F18} -funparse-with-symbols %s -o /dev/null 2>&1 | grep -v 'procedure conflicts' | ${FileCheck} %s
-! CHECK-NOT: error:[[:space:]]
-
-! FIXME: filter out the array/function syntax issues (procedure conflicts)
-! for now...
+! RUN: %f18 -funparse-with-symbols -DSTRICT_F18 -Mstandard %s 2>&1 | FileCheck %s
+! RUN: %f18 -funparse-with-symbols -DARCHAIC_FORTRAN %s 2>&1 | FileCheck %s
+! CHECK-NOT: error:{{[[:space:]]}}
+! FIXME: the above check line does not work because diags are not emitted with error: in them.
 
 ! these are the conformance tests
 ! define STRICT_F18 to eliminate tests of features not in F18
 ! define ARCHAIC_FORTRAN to add test of feature found in Fortran before F95
 
 
 subroutine sub00(a,b,n,m)
   integer :: n, m
subroutine do_loop07(a,n)
   real, dimension(n,n) :: a
   loopone: do j = 1, n
      looptwo: do i = 1, n
         print *, i, j, a(i, j)
      end do looptwo
   end do loopone
 end subroutine do_loop07
 
+#ifndef STRICT_F18
 subroutine do_loop08(a,b,n,m,nn)
   integer :: n, m, nn
   real, dimension(n,n) :: a
   real b(m,nn)
   loopone: do j = 1, n
      condone: if (m .lt. n) then
         looptwo: do i = 1, m
            condtwo: if (n .lt. nn) then
else if (n .lt. m) then
            else
               exit loopthree
            end if condthree
         end do loopthree
      end if condone
   end do loopone
 111 print *, "done"
 end subroutine do_loop08
+#endif
 
 #ifndef STRICT_F18
 ! extended ranges supported by PGI, gfortran gives warnings
 subroutine do_loop09(a,n,j)
   integer :: n
   real a(n)
   goto 400
 200 print *, "found the index", j
   print *, "value at", j, "is", a(j)
-  goto 300
+  goto 300 ! FIXME: emits diagnostic even without -Mstandard
 400  do 100 i = 1, n
      if (i .eq. j) then
         goto 200  ! extension: extended GOTO ranges
 300     continue
      else
         print *, a(i)
      end if
 100 end do

 310 print *,"=="
 340 goto 330
 320 print *,">"
 330 goto 350
 350 continue
 end subroutine arith_if12
 #endif
 
-#if 0
+#ifndef STRICT_F18
 subroutine alt_return_spec13(i,*,*,*)
 9 continue
 8 labelme: if (i .lt. 42) then
 7  return 1
 6 else if (i .lt. 94) then
 5  return 2
 4 else if (i .lt. 645) then
 3  return 3
 2 end if labelme
 1 end subroutine alt_return_spec13
 
 subroutine alt_return_spec14(i)
   call alt_return_spec13(i,*6000,*6130,*6457)
   print *, "Hi!"
 6000 continue
 6100 print *,"123"
 6130 continue
 6400 print *,"abc"
 6457 continue
 6650 print *,"!@#"
 end subroutine alt_return_spec14
 #endif
 
+#ifndef STRICT_F18
 subroutine specifiers15(a,b,x)
   integer x
   OPEN (10, file="myfile.dat", err=100)
   READ (10,20,end=200,size=x,advance='no',eor=300) a
   goto 99
 99 CLOSE (10)
   goto 40
 100 print *,"error opening"
 101 return
 200 print *,"end of file"
 202 return
 300 print *, "end of record"
 303 return
 20 FORMAT (1x,F5.1)
 30 FORMAT (2x,F6.2)
 40 OPEN (11, file="myfile2.dat", err=100)
   goto 50
 50 WRITE (11,30,err=100) b
   CLOSE (11)
 end subroutine specifiers15
+#endif
 
 #if !defined(STRICT_F18) && defined(ARCHAIC_FORTRAN)
 ! assigned goto was deleted in F95. PGI supports, gfortran gives warnings
 subroutine assigned_goto16
   assign 10 to i
   goto i (10, 20, 30)
 10 continue
   assign 20 to i
 20 continue
   assign 30 to i
 30 pause
   print *, "archaic feature!"
 end subroutine assigned_goto16
 #endif

flang/test/Semantics/label11.f90

-! RUN: %S/test_any.sh %s %t %f18
-! EXEC: ${F18} -funparse-with-symbols %s 2>&1 | ${FileCheck} %s
+! RUN: not %f18 -funparse-with-symbols %s 2>&1 | FileCheck %s
 ! CHECK: BLOCK DATA subprogram name mismatch
 ! CHECK: should be
 ! CHECK: FUNCTION name mismatch
 ! CHECK: SUBROUTINE name mismatch
 ! CHECK: PROGRAM name mismatch
 ! CHECK: SUBMODULE name mismatch
-! CHECK: INTERFACE generic-name .t7. mismatch
+! CHECK: INTERFACE generic-name (t7) mismatch
 ! CHECK: mismatched INTERFACE
 ! CHECK: derived type definition name mismatch
 ! CHECK: MODULE PROCEDURE name mismatch
 ! CHECK: MODULE name mismatch
 ! C739 If END TYPE is followed by a type-name, the type-name shall be the
 ! same as that in the corresponding derived-type-stmt.
 
 block data t1