[flang] Port test_any.sh tests to FileCheck

[richard.barton.arm]

Summary

Port the remaining tests which only require mechanical changes.

• Delete old RUN lines
• Replace:

EXEC: ${F18} ... | ${FileCheck} ...

with

RUN: %f18 .. | FileCheck ...

• Prepend RUN line with not when it is expected to fail

[DavidTruby]

flang/test/Semantics/canondo05.f90

1–2

What does this XXXEXEC line do here? I don't think it's something FileCheck will understand

[richard.barton.arm]

Reinstate previously crippled EXEC line

[richard.barton.arm]

flang/test/Semantics/canondo05.f90

1–2

This was a test_any.sh 'RUN' line, so named EXEC so that lit would not try to run it, that was broken. Looking at the logs it is likely the original test was added before F18 could parse the OpenMP directives inside. Simple change to reinstate this as a ported RUN line.

[schweitz]

Did you remove the test_any.sh script in one of these?

Thanks for porting these.

[richard.barton.arm]

I'll do it in this one when I commit.

Thanks for the review!

flang/test/Semantics/canondo01.f90

-! RUN: %S/test_any.sh %s %t %f18
-! negative test -- invalid labels, out of range
 
-! EXEC: ${F18} -funparse-with-symbols %s 2>&1 | ${FileCheck} %s
+! RUN: %f18 -funparse-with-symbols %s 2>&1 | FileCheck %s
 ! CHECK: end do
 
 SUBROUTINE sub00(a,b,n,m)
   INTEGER n,m
   REAL a(n,m), b(n,m)
 
   DO 10 j = 1,m
      DO 10 i = 1,n
         g = a(i,j) - b(i,j)
 10      PRINT *, g
 END SUBROUTINE sub00

flang/test/Semantics/canondo02.f90

-! RUN: %S/test_any.sh %s %t %f18
-! negative test -- invalid labels, out of range
 
-! EXEC: ${F18} -funparse-with-symbols %s 2>&1 | ${FileCheck} %s
+! RUN: %f18 -funparse-with-symbols %s 2>&1 | FileCheck %s
 ! CHECK: end do
 
 SUBROUTINE sub00(a,b,n,m)
   INTEGER n,m
   REAL a(n,m), b(n,m)
 
   i = n-1
   DO 10 j = 1,m
      g = a(i,j) - b(i,j)
 10   PRINT *, g
 END SUBROUTINE sub00

flang/test/Semantics/canondo03.f90

-! RUN: %S/test_any.sh %s %t %f18
-! negative test -- invalid labels, out of range
 
-! EXEC: ${F18} -funparse-with-symbols %s 2>&1 | ${FileCheck} %s
+! RUN: %f18 -funparse-with-symbols %s 2>&1 | FileCheck %s
 ! CHECK: 10 continue
 ! CHECK: end do
 
 SUBROUTINE sub00(a,b,n,m)
   INTEGER n,m
   REAL a(n,m), b(n,m)
 
   i = n-1
   DO 10 j = 1,m
      g = a(i,j) - b(i,j)
      PRINT *, g
 10 END DO
 END SUBROUTINE sub00

flang/test/Semantics/canondo04.f90

-! RUN: %S/test_any.sh %s %t %f18
-! EXEC: ${F18} -funparse-with-symbols %s 2>&1 | ${FileCheck} %s
+! RUN: %f18 -funparse-with-symbols %s 2>&1 | FileCheck %s
 ! CHECK-NOT: do [1-9]
 
 ! Figure out how to also execute this test.
 
 program main
   integer :: results(100)
   integer :: count
   count = 0

flang/test/Semantics/canondo05.f90

-! RUN: %S/test_any.sh %s %t %f18
-! EXEC: ${F18} -funparse-with-symbols %s 2>&1 | ${FileCheck} %s
-! XXXEXEC: ${F18} -fopenmp -funparse-with-symbols %s 2>&1 | ${FileCheck} %s
+! RUN: %f18 -funparse-with-symbols %s 2>&1 | FileCheck %s
+! RUN: %f18 -fopenmp -funparse-with-symbols %s 2>&1 | FileCheck %s
 ! CHECK-NOT: do *[1-9]
 
 program P
 implicit none
 integer OMP_GET_NUM_THREADS, OMP_GET_THREAD_NUM
 integer NUMTHRDS, TID
 integer N, CSZ, CNUM, I
 parameter (N=100)

flang/test/Semantics/canondo06.f90

-! RUN: %S/test_any.sh %s %t %f18
-! EXEC: ${F18} -fopenmp -funparse-with-symbols %s 2>&1 | ${FileCheck} %s
+! RUN: %f18 -fopenmp -funparse-with-symbols %s 2>&1 | FileCheck %s
 ! CHECK-NOT: do *[1-9]
 ! CHECK: omp simd
 
 program P
 implicit none
 integer N, I
 parameter (N=100)
 real A(N), B(N), C(N)

flang/test/Semantics/canondo07.f90

-! RUN: %S/test_any.sh %s %t %f18
 ! Error test -- DO loop uses obsolete loop termination statement
 ! See R1131 and C1131
 
-! EXEC: ${F18} -funparse-with-symbols -Mstandard %s 2>&1 | ${FileCheck} %s
+! RUN: %f18 -funparse-with-symbols -Mstandard %s 2>&1 | FileCheck %s
 ! CHECK: A DO loop should terminate with an END DO or CONTINUE
 
 program endDo
   do 10 i = 1, 5
 10  print *, "in loop"
 end program endDo

flang/test/Semantics/canondo19.f90

-! RUN: %S/test_any.sh %s %t %f18
 ! Check that if there is a label or a name on an label-do-stmt,
 ! then it is not lost when rewriting it to an non-label-do-stmt.
 
-! EXEC: ${F18} -funparse-with-symbols -Mstandard %s 2>&1 | ${FileCheck} %s
+! RUN: %f18 -funparse-with-symbols -Mstandard %s 2>&1 | FileCheck %s
 
 ! CHECK: end do
 ! CHECK: 2 do
 ! CHECK: mainloop: do
 ! CHECK: end do mainloop
 
 ! CHECK-NOT: do [1-9]
 

flang/test/Semantics/critical04.f90

-! RUN: %S/test_any.sh %s %t %f18
-! EXEC: ${F18} -funparse-with-symbols %s 2>&1 | ${FileCheck} %s
+! RUN: %f18 -funparse-with-symbols %s 2>&1 | FileCheck %s
 ! CHECK-NOT: Control flow escapes from CRITICAL
 
 subroutine test1(a, i)
   integer i
   real a(10)
   critical
     if (a(i) < 0.0) then
       a(i) = 20.20

flang/test/Semantics/doconcurrent02.f90

-! RUN: %S/test_any.sh %s %t %f18
-! negative tests: we don't want DO CONCURRENT semantics constraints checked
 ! when the loops are not DO CONCURRENT
 
-! EXEC: ${F18} -funparse-with-symbols %s 2>&1 | ${FileCheck} %s
+! RUN: not %f18 -funparse-with-symbols %s 2>&1 | FileCheck %s
 ! CHECK-NOT: image control statement not allowed in DO CONCURRENT
 ! CHECK-NOT: RETURN not allowed in DO CONCURRENT
 ! CHECK-NOT: call to impure procedure in DO CONCURRENT not allowed
 ! CHECK-NOT: IEEE_GET_FLAG not allowed in DO CONCURRENT
 ! CHECK-NOT: ADVANCE specifier not allowed in DO CONCURRENT
 ! CHECK-NOT: SYNC ALL
 ! CHECK-NOT: SYNC IMAGES
 

flang/test/Semantics/doconcurrent03.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: Control flow escapes from DO CONCURRENT
 ! CHECK: branch into loop body from outside
 ! CHECK: the loop branched into
 
 subroutine s(a)
   integer i
   real a(10)
   do 10 concurrent (i = 1:10)

flang/test/Semantics/doconcurrent07.f90

-! RUN: %S/test_any.sh %s %t %f18
-! EXEC: ${F18} -funparse-with-symbols %s 2>&1 | ${FileCheck} %s
+! RUN: %f18 -funparse-with-symbols %s 2>&1 | FileCheck %s
 ! CHECK-NOT: exit from DO CONCURRENT construct
 
 subroutine do_concurrent_test1(n)
   implicit none
   integer :: j,k,l,n
   mytest: if (n>0) then
   mydoc:    do concurrent(j=1:n)
               mydo: do k=1,n

flang/test/Semantics/label02.f90

-! RUN: %S/test_any.sh %s %t %f18
-! negative test -- invalid labels, out of range
 
-! EXEC: ${F18} -funparse-with-symbols %s 2>&1 | ${FileCheck} %s
+! RUN: not %f18 -funparse-with-symbols %s 2>&1 | FileCheck %s
 ! CHECK: Label '0' is out of range
 ! CHECK: Label '100000' is out of range
 ! CHECK: Label '123456' is out of range
 ! CHECK: Label '123456' was not found
 ! CHECK: Label '1000' is not distinct
 
 subroutine sub00(a,b,n,m)
   real a(n)
   real :: b(m)
 0 print *, "error"
 100000 print *, n
   goto 123456
 1000 print *, m
 1000 print *, m+1
 end subroutine sub00

flang/test/Semantics/label03.f90

-! RUN: %S/test_any.sh %s %t %f18
-! negative test -- invalid labels, out of range
 
-! EXEC: ${F18} -funparse-with-symbols %s 2>&1 | ${FileCheck} %s
+! RUN: not %f18 -funparse-with-symbols %s 2>&1 | FileCheck %s
 ! CHECK: DO loop doesn't properly nest
 ! CHECK: DO loop conflicts
 ! CHECK: Label '30' cannot be found
 ! CHECK: Label '40' cannot be found
 ! CHECK: Label '50' doesn't lexically follow DO stmt
 
 subroutine sub00(a,b,n,m)
   real a(n,m)

flang/test/Semantics/label04.f90

-! RUN: %S/test_any.sh %s %t %f18
-! negative test -- invalid labels, out of range
 
-! EXEC: ${F18} -funparse-with-symbols %s 2>&1 | ${FileCheck} %s
+! RUN: %f18 -funparse-with-symbols %s 2>&1 | FileCheck %s
 ! CHECK: branch into loop body from outside
 ! CHECK: do 10 i = 1, m
 ! CHECK: the loop branched into
 ! CHECK: do 20 j = 1, n
 
 subroutine sub00(a,b,n,m)
   real a(n,m)
   real b(n,m)

flang/test/Semantics/label05.f90

-! RUN: %S/test_any.sh %s %t %f18
-! negative test -- invalid labels, out of range
 
-! EXEC: ${F18} -funparse-with-symbols %s 2>&1 | ${FileCheck} %s
+! RUN: not %f18 -funparse-with-symbols %s 2>&1 | FileCheck %s
 ! CHECK: Label '50' was not found
 ! CHECK: Label '55' is not in scope
 ! CHECK: Label '70' is not a branch target
 ! CHECK: Control flow use of '70'
 
 subroutine sub00(a,b,n,m)
   real a(n,m)
   real b(n,m)

flang/test/Semantics/label06.f90

-! RUN: %S/test_any.sh %s %t %f18
-! negative test -- invalid labels, out of range
 
-! EXEC: ${F18} -funparse-with-symbols %s 2>&1 | ${FileCheck} %s
+! RUN: not %f18 -funparse-with-symbols %s 2>&1 | FileCheck %s
 ! CHECK: Label '10' is not in scope
 ! CHECK: Label '20' was not found
 ! CHECK: Label '30' is not a branch target
 ! CHECK: Control flow use of '30'
 ! CHECK: Label '40' is not in scope
 ! CHECK: Label '50' is not in scope
 
 subroutine sub00(n)

flang/test/Semantics/label07.f90

-! RUN: %S/test_any.sh %s %t %f18
-! negative test -- invalid labels, out of range
 
-! EXEC: ${F18} -funparse-with-symbols %s 2>&1 | ${FileCheck} %s
+! RUN: not %f18 -funparse-with-symbols %s 2>&1 | FileCheck %s
 ! CHECK: Label '30' is not a branch target
 ! CHECK: Control flow use of '30'
 ! CHECK: Label '10' is not in scope
 ! CHECK: Label '20' was not found
 ! CHECK: Label '60' was not found
 
 subroutine sub00(n,m)
 30 format (i6,f6.2)
   if (n .eq. m) then
 10   print *,"equal"
   end if
   call sub01(n,*10,*20,*30)
   write (*,60) n, m
 end subroutine sub00

flang/test/Semantics/label08.f90

-! RUN: %S/test_any.sh %s %t %f18
-! negative test -- invalid labels, out of range
 
-! EXEC: ${F18} -funparse-with-symbols %s 2>&1 | ${FileCheck} %s
+! RUN: not %f18 -funparse-with-symbols %s 2>&1 | FileCheck %s
 ! CHECK: CYCLE construct-name is not in scope
 ! CHECK: IF construct name unexpected
 ! CHECK: unnamed IF statement
 ! CHECK: DO construct name mismatch
 ! CHECK: should be
 
 subroutine sub00(a,b,n,m)
   real a(n,m)

flang/test/Semantics/label09.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: Label '60' was not found
 
 subroutine s(a)
   real a(10)
   write(*,60) "Hi there"
 end subroutine s

flang/test/Semantics/label10.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: '60' not a FORMAT
 ! CHECK: data transfer use of '60'
 
 subroutine s(a)
   real a(10)
   write(*,60) "Hi there"
 60 continue
 70 format (i8)
 end subroutine s

flang/test/Semantics/label12.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: expected end of statement
 
 subroutine s
   do 10 i = 1, 10
 5  end do
 10 end do
 end subroutine s

flang/test/Semantics/label13.f90

-! RUN: %S/test_any.sh %s %t %f18
-! EXEC: ${F18} -funparse-with-symbols %s 2>&1 | ${FileCheck} %s
+! RUN: %f18 -funparse-with-symbols %s 2>&1 | FileCheck %s
 ! CHECK: branch into loop body from outside
 ! CHECK: the loop branched into
 
 subroutine s(a)
   integer i
   real a(10)
   do 10 i = 1,10
      if (a(i) < 0.0) then

flang/test/Semantics/label14.f90

-! RUN: %S/test_any.sh %s %t %f18
 ! Tests implemented for this standard
 ! 11.1.4 - 4 It is permissible to branch to and end-block-stmt only withinh its
 !            Block Construct
 
-! EXEC: ${F18} %s 2>&1 | ${FileCheck} %s
+! RUN: not %f18 %s 2>&1 | FileCheck %s
 ! CHECK: Label '20' is not in scope
 
 subroutine s1
   block
     goto (10) 1
 10  end block
 
   block

flang/test/Semantics/test_any.sh

-#/usr/bin/env bash
-# Compile a source file with '-funparse-with-symbols' and verify
-# we get the right symbols in the output, i.e. the output should be
-# the same as the input, except for the copyright comment.
-# Change the compiler by setting the F18 environment variable.
-
-srcdir=$(dirname $0)
-source $srcdir/common.sh
-
-FileCheck=internal_check
-
-function internal_check() {
-  r=true
-  linput="$1"
-  lstdin=`mktemp`
-  lcheck=`mktemp`
-  cat - > ${lstdin}
-  egrep '^[[:space:]]*![[:space:]]*CHECK:[[:space:]]*' ${linput} | sed -e 's/^[[:space:]]*![[:space:]]*CHECK:[[:space:]]*//' > ${lcheck} 2>/dev/null
-  while read p; do
-    if egrep "${p}" ${lstdin} >/dev/null 2>&1; then
-      true
-    else
-      echo "Not found: ${p}" >&2
-      r=false
-    fi
-  done < ${lcheck}
-  egrep '^[[:space:]]*![[:space:]]*CHECK-NOT:[[:space:]]*' ${linput} | sed -e 's/^[[:space:]]*![[:space:]]*CHECK-NOT:[[:space:]]*//' > ${lcheck} 2>/dev/null
-  while read p; do
-    if egrep "${p}" ${lstdin} >/dev/null 2>&1; then
-      echo "Found: ${p}" >&2
-      r=false
-    fi
-  done < ${lcheck}
-  egrep '^[[:space:]]*![[:space:]]*CHECK-ONCE:[[:space:]]*' ${linput} | sed -e 's/^[[:space:]]*![[:space:]]*CHECK-ONCE:[[:space:]]*//' > ${lcheck} 2>/dev/null
-  while read p; do
-    count=$(egrep -o -e "${p}" ${lstdin} | wc -l)
-    if [ ${count} -eq 0 ]; then
-      echo "Not found: ${p}" >&2
-      r=false
-    fi
-    if [ ${count} -gt 1 ]; then
-      echo "Found duplicates: ${p}" >&2
-      r=false
-    fi
-  done < ${lcheck}
-  rm -f ${lstdin} ${lcheck}
-  ${r}
-}
-
-gr=0
-for input in $src; do
-  [[ ! -f $input ]] && die "File not found: $input"
-  CMD=$(cat ${input} | egrep '^[[:space:]]*![[:space:]]*EXEC:[[:space:]]*' | sed -e 's/^[[:space:]]*![[:space:]]*EXEC:[[:space:]]*//')
-  CMD=$(echo ${CMD} | sed -e "s:%s:${input}:g")
-  if egrep -q -e '%t' <<< ${CMD} ; then
-    CMD=$(echo ${CMD} | sed -e "s:%t:$temp/t:g")
-  fi
-  if $(eval $CMD); then
-    echo "PASS  ${input}"
-  else
-    echo "FAIL  ${input}"
-    gr=1
-  fi
-done
-exit $gr