maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[flang] Port test_any.sh tests to FileCheck: Hand port canondo{08-18} tests 

These tests checked for stdout and stderr in the same pipe, which does not
come out in a guaranteed order. test_any.sh's FileCheck accepts CHECK lines in
any order while FileCheck checks must match in order.

Hand port these to pipe stdout to a temp file which is checked with a separate
FileCheck RUN line to test it.

Differential Revision: https://reviews.llvm.org/D82167
This commit is contained in:
Richard Barton 2020-06-26 18:50:46 +01:00
parent bf57fc1c8e
commit ae74252341
11 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
flang/test/Semantics/canondo08.f90
View File

@ -1,4 +1,3 @@
! RUN: %S/test_any.sh %s %t %f18
! Error test -- DO loop uses obsolete loop termination statement ! Error test -- DO loop uses obsolete loop termination statement
! See R1131 and C1133 ! See R1131 and C1133
@ -6,7 +5,7 @@
! A warning is generated with -Mstandard ! A warning is generated with -Mstandard
! EXEC: ${F18} -funparse-with-symbols -Mstandard %s 2>&1 | ${FileCheck} %s ! RUN: %f18 -funparse-with-symbols -Mstandard %s 2>%t.stderr | FileCheck %s
! CHECK: end do ! CHECK: end do
@ -15,7 +14,8 @@
! not want to see label do in the unparse only. ! not want to see label do in the unparse only.
! CHECK-NOT: do [1-9] ! CHECK-NOT: do [1-9]
! CHECK: A DO loop should terminate with an END DO or CONTINUE ! RUN: FileCheck --check-prefix=ERR --input-file=%t.stderr %s
! ERR: A DO loop should terminate with an END DO or CONTINUE
subroutine foo1() subroutine foo1()
do 01 k=1,2 do 01 k=1,2

8
flang/test/Semantics/canondo09.f90
View File

@ -1,12 +1,11 @@
! RUN: %S/test_any.sh %s %t %f18 ! Error test -- DO loop uses obsolete loop termination statement (warning)
! Error test -- DO loop uses obsolete loop termination statement
! See R1131 and C1133 ! See R1131 and C1133
! By default, this is not an error and label do are rewritten to non-label do. ! By default, this is not an error and label do are rewritten to non-label do.
! A warning is generated with -Mstandard ! A warning is generated with -Mstandard
! EXEC: ${F18} -funparse-with-symbols -Mstandard %s 2>&1 | ${FileCheck} %s ! RUN: %f18 -funparse-with-symbols -Mstandard %s 2>%t.stderr | FileCheck %s
! CHECK: end do ! CHECK: end do
@ -15,7 +14,8 @@
! not want to see label do in the unparse only. ! not want to see label do in the unparse only.
! CHECK-NOT: do [1-9] ! CHECK-NOT: do [1-9]
! CHECK: A DO loop should terminate with an END DO or CONTINUE ! RUN: FileCheck --check-prefix=ERR --input-file=%t.stderr %s
! ERR: A DO loop should terminate with an END DO or CONTINUE
subroutine foo0() subroutine foo0()
do 01 j=1,2 do 01 j=1,2

8
flang/test/Semantics/canondo10.f90
View File

@ -1,12 +1,11 @@
! RUN: %S/test_any.sh %s %t %f18 ! Error test -- DO loop uses obsolete loop termination statement (warning)
! Error test -- DO loop uses obsolete loop termination statement
! See R1131 and C1133 ! See R1131 and C1133
! By default, this is not an error and label do are rewritten to non-label do. ! By default, this is not an error and label do are rewritten to non-label do.
! A warning is generated with -Mstandard ! A warning is generated with -Mstandard
! EXEC: ${F18} -funparse-with-symbols -Mstandard %s 2>&1 | ${FileCheck} %s ! RUN: %f18 -funparse-with-symbols -Mstandard %s 2>%t.stderr | FileCheck %s
! CHECK: end do ! CHECK: end do
@ -15,7 +14,8 @@
! not want to see label do in the unparse only. ! not want to see label do in the unparse only.
! CHECK-NOT: do [1-9] ! CHECK-NOT: do [1-9]
! CHECK: A DO loop should terminate with an END DO or CONTINUE ! RUN: FileCheck --check-prefix=ERR --input-file=%t.stderr %s
! ERR: A DO loop should terminate with an END DO or CONTINUE
subroutine foo2() subroutine foo2()
do 01 l=1,2 do 01 l=1,2

8
flang/test/Semantics/canondo11.f90
View File

@ -1,12 +1,11 @@
! RUN: %S/test_any.sh %s %t %f18 ! Error test -- DO loop uses obsolete loop termination statement (warning)
! Error test -- DO loop uses obsolete loop termination statement
! See R1131 and C1133 ! See R1131 and C1133
! By default, this is not an error and label do are rewritten to non-label do. ! By default, this is not an error and label do are rewritten to non-label do.
! A warning is generated with -Mstandard ! A warning is generated with -Mstandard
! EXEC: ${F18} -funparse-with-symbols -Mstandard %s 2>&1 | ${FileCheck} %s ! RUN: %f18 -funparse-with-symbols -Mstandard %s 2>%t.stderr | FileCheck %s
! CHECK: end do ! CHECK: end do
@ -15,7 +14,8 @@
! not want to see label do in the unparse only. ! not want to see label do in the unparse only.
! CHECK-NOT: do [1-9] ! CHECK-NOT: do [1-9]
! CHECK: A DO loop should terminate with an END DO or CONTINUE ! RUN: FileCheck --check-prefix=ERR --input-file=%t.stderr %s
! ERR: A DO loop should terminate with an END DO or CONTINUE
subroutine foo3() subroutine foo3()
real :: a(10, 10), b(10, 10) = 1.0 real :: a(10, 10), b(10, 10) = 1.0

8
flang/test/Semantics/canondo12.f90
View File

@ -1,11 +1,10 @@
! RUN: %S/test_any.sh %s %t %f18 ! Error test -- DO loop uses obsolete loop termination statement (warning)
! Error test -- DO loop uses obsolete loop termination statement
! See R1131 and C1133 ! See R1131 and C1133
! By default, this is not an error and label do are rewritten to non-label do. ! By default, this is not an error and label do are rewritten to non-label do.
! A warning is generated with -Mstandard ! A warning is generated with -Mstandard
! EXEC: ${F18} -funparse-with-symbols -Mstandard %s 2>&1 | ${FileCheck} %s ! RUN: %f18 -funparse-with-symbols -Mstandard %s 2>%t.stderr | FileCheck %s
! CHECK: end do ! CHECK: end do
@ -14,7 +13,8 @@
! not want to see label do in the unparse only. ! not want to see label do in the unparse only.
! CHECK-NOT: do [1-9] ! CHECK-NOT: do [1-9]
! CHECK: A DO loop should terminate with an END DO or CONTINUE ! RUN: FileCheck --check-prefix=ERR --input-file=%t.stderr %s
! ERR: A DO loop should terminate with an END DO or CONTINUE
subroutine foo4() subroutine foo4()
real :: a(10, 10), b(10, 10) = 1.0 real :: a(10, 10), b(10, 10) = 1.0

8
flang/test/Semantics/canondo13.f90
View File

@ -1,11 +1,10 @@
! RUN: %S/test_any.sh %s %t %f18 ! Error test -- DO loop uses obsolete loop termination statement (warning)
! Error test -- DO loop uses obsolete loop termination statement
! See R1131 and C1133 ! See R1131 and C1133
! By default, this is not an error and label do are rewritten to non-label do. ! By default, this is not an error and label do are rewritten to non-label do.
! A warning is generated with -Mstandard ! A warning is generated with -Mstandard
! EXEC: ${F18} -funparse-with-symbols -Mstandard %s 2>&1 | ${FileCheck} %s ! RUN: %f18 -funparse-with-symbols -Mstandard %s 2>%t.stderr | FileCheck %s
! CHECK: end do ! CHECK: end do
@ -14,7 +13,8 @@
! not want to see label do in the unparse only. ! not want to see label do in the unparse only.
! CHECK-NOT: do [1-9] ! CHECK-NOT: do [1-9]
! CHECK: A DO loop should terminate with an END DO or CONTINUE ! RUN: FileCheck --check-prefix=ERR --input-file=%t.stderr %s
! ERR: A DO loop should terminate with an END DO or CONTINUE
subroutine foo5() subroutine foo5()
real :: a(10, 10), b(10, 10) = 1.0 real :: a(10, 10), b(10, 10) = 1.0

8
flang/test/Semantics/canondo14.f90
View File

@ -1,11 +1,10 @@
! RUN: %S/test_any.sh %s %t %f18 ! Error test -- DO loop uses obsolete loop termination statement (warning)
! Error test -- DO loop uses obsolete loop termination statement
! See R1131 and C1133 ! See R1131 and C1133
! By default, this is not an error and label do are rewritten to non-label do. ! By default, this is not an error and label do are rewritten to non-label do.
! A warning is generated with -Mstandard ! A warning is generated with -Mstandard
! EXEC: ${F18} -funparse-with-symbols -Mstandard %s 2>&1 | ${FileCheck} %s ! RUN: %f18 -funparse-with-symbols -Mstandard %s 2>%t.stderr | FileCheck %s
! CHECK: end do ! CHECK: end do
@ -14,7 +13,8 @@
! not want to see label do in the unparse only. ! not want to see label do in the unparse only.
! CHECK-NOT: do [1-9] ! CHECK-NOT: do [1-9]
! CHECK: A DO loop should terminate with an END DO or CONTINUE ! RUN: FileCheck --check-prefix=ERR --input-file=%t.stderr %s
! ERR: A DO loop should terminate with an END DO or CONTINUE
subroutine foo6(a) subroutine foo6(a)
type whatever type whatever

8
flang/test/Semantics/canondo15.f90
View File

@ -1,11 +1,10 @@
! RUN: %S/test_any.sh %s %t %f18 ! Error test -- DO loop uses obsolete loop termination statement (warning)
! Error test -- DO loop uses obsolete loop termination statement
! See R1131 and C1133 ! See R1131 and C1133
! By default, this is not an error and label do are rewritten to non-label do. ! By default, this is not an error and label do are rewritten to non-label do.
! A warning is generated with -Mstandard ! A warning is generated with -Mstandard
! EXEC: ${F18} -funparse-with-symbols -Mstandard %s 2>&1 | ${FileCheck} %s ! RUN: %f18 -funparse-with-symbols -Mstandard %s 2>%t.stderr | FileCheck %s
! CHECK: end do ! CHECK: end do
@ -14,7 +13,8 @@
! not want to see label do in the unparse only. ! not want to see label do in the unparse only.
! CHECK-NOT: do [1-9] ! CHECK-NOT: do [1-9]
! CHECK: A DO loop should terminate with an END DO or CONTINUE ! RUN: FileCheck --check-prefix=ERR --input-file=%t.stderr %s
! ERR: A DO loop should terminate with an END DO or CONTINUE
subroutine foo7(a) subroutine foo7(a)
integer :: a(..) integer :: a(..)

8
flang/test/Semantics/canondo16.f90
View File

@ -1,11 +1,10 @@
! RUN: %S/test_any.sh %s %t %f18 ! Error test -- DO loop uses obsolete loop termination statement (warning)
! Error test -- DO loop uses obsolete loop termination statement
! See R1131 and C1133 ! See R1131 and C1133
! By default, this is not an error and label do are rewritten to non-label do. ! By default, this is not an error and label do are rewritten to non-label do.
! A warning is generated with -Mstandard ! A warning is generated with -Mstandard
! EXEC: ${F18} -funparse-with-symbols -Mstandard %s 2>&1 | ${FileCheck} %s ! RUN: %f18 -funparse-with-symbols -Mstandard %s 2>%t.stderr | FileCheck %s
! CHECK: end do ! CHECK: end do
@ -14,7 +13,8 @@
! not want to see label do in the unparse only. ! not want to see label do in the unparse only.
! CHECK-NOT: do [1-9] ! CHECK-NOT: do [1-9]
! CHECK: A DO loop should terminate with an END DO or CONTINUE ! RUN: FileCheck --check-prefix=ERR --input-file=%t.stderr %s
! ERR: A DO loop should terminate with an END DO or CONTINUE
subroutine foo8() subroutine foo8()
use iso_fortran_env, only : team_type use iso_fortran_env, only : team_type

8
flang/test/Semantics/canondo17.f90
View File

@ -1,11 +1,10 @@
! RUN: %S/test_any.sh %s %t %f18 ! Error test -- DO loop uses obsolete loop termination statement (warning)
! Error test -- DO loop uses obsolete loop termination statement
! See R1131 and C1133 ! See R1131 and C1133
! By default, this is not an error and label do are rewritten to non-label do. ! By default, this is not an error and label do are rewritten to non-label do.
! A warning is generated with -Mstandard ! A warning is generated with -Mstandard
! EXEC: ${F18} -funparse-with-symbols -Mstandard %s 2>&1 | ${FileCheck} %s ! RUN: %f18 -funparse-with-symbols -Mstandard %s 2>%t.stderr | FileCheck %s
! CHECK: end do ! CHECK: end do
@ -14,7 +13,8 @@
! not want to see label do in the unparse only. ! not want to see label do in the unparse only.
! CHECK-NOT: do [1-9] ! CHECK-NOT: do [1-9]
! CHECK: A DO loop should terminate with an END DO or CONTINUE ! RUN: FileCheck --check-prefix=ERR --input-file=%t.stderr %s
! ERR: A DO loop should terminate with an END DO or CONTINUE
subroutine foo9() subroutine foo9()
real :: a(10, 10), b(10, 10) = 1.0 real :: a(10, 10), b(10, 10) = 1.0

8
flang/test/Semantics/canondo18.f90
View File

@ -1,11 +1,10 @@
! RUN: %S/test_any.sh %s %t %f18 ! Error test -- DO loop uses obsolete loop termination statement (warning)
! Error test -- DO loop uses obsolete loop termination statement
! See R1131 and C1133 ! See R1131 and C1133
! By default, this is not an error and label do are rewritten to non-label do. ! By default, this is not an error and label do are rewritten to non-label do.
! A warning is generated with -Mstandard ! A warning is generated with -Mstandard
! EXEC: ${F18} -funparse-with-symbols -Mstandard %s 2>&1 | ${FileCheck} %s ! RUN: %f18 -funparse-with-symbols -Mstandard %s 2>%t.stderr | FileCheck %s
! CHECK: end do ! CHECK: end do
@ -14,7 +13,8 @@
! not want to see label do in the unparse only. ! not want to see label do in the unparse only.
! CHECK-NOT: do [1-9] ! CHECK-NOT: do [1-9]
! CHECK: A DO loop should terminate with an END DO or CONTINUE ! RUN: FileCheck --check-prefix=ERR --input-file=%t.stderr %s
! ERR: A DO loop should terminate with an END DO or CONTINUE
subroutine foo10() subroutine foo10()
real :: a(10, 10), b(10, 10) = 1.0 real :: a(10, 10), b(10, 10) = 1.0