diff --git a/flang/test/Semantics/canondo01.f90 b/flang/test/Semantics/canondo01.f90 --- a/flang/test/Semantics/canondo01.f90 +++ b/flang/test/Semantics/canondo01.f90 @@ -1,7 +1,5 @@ -! 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) diff --git a/flang/test/Semantics/canondo02.f90 b/flang/test/Semantics/canondo02.f90 --- a/flang/test/Semantics/canondo02.f90 +++ b/flang/test/Semantics/canondo02.f90 @@ -1,7 +1,5 @@ -! 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) diff --git a/flang/test/Semantics/canondo03.f90 b/flang/test/Semantics/canondo03.f90 --- a/flang/test/Semantics/canondo03.f90 +++ b/flang/test/Semantics/canondo03.f90 @@ -1,7 +1,5 @@ -! 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 diff --git a/flang/test/Semantics/canondo04.f90 b/flang/test/Semantics/canondo04.f90 --- a/flang/test/Semantics/canondo04.f90 +++ b/flang/test/Semantics/canondo04.f90 @@ -1,5 +1,4 @@ -! 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. diff --git a/flang/test/Semantics/canondo05.f90 b/flang/test/Semantics/canondo05.f90 --- a/flang/test/Semantics/canondo05.f90 +++ b/flang/test/Semantics/canondo05.f90 @@ -1,6 +1,5 @@ -! 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 diff --git a/flang/test/Semantics/canondo06.f90 b/flang/test/Semantics/canondo06.f90 --- a/flang/test/Semantics/canondo06.f90 +++ b/flang/test/Semantics/canondo06.f90 @@ -1,5 +1,4 @@ -! 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 diff --git a/flang/test/Semantics/canondo07.f90 b/flang/test/Semantics/canondo07.f90 --- a/flang/test/Semantics/canondo07.f90 +++ b/flang/test/Semantics/canondo07.f90 @@ -1,8 +1,7 @@ -! 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 diff --git a/flang/test/Semantics/canondo19.f90 b/flang/test/Semantics/canondo19.f90 --- a/flang/test/Semantics/canondo19.f90 +++ b/flang/test/Semantics/canondo19.f90 @@ -1,8 +1,7 @@ -! 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 diff --git a/flang/test/Semantics/critical04.f90 b/flang/test/Semantics/critical04.f90 --- a/flang/test/Semantics/critical04.f90 +++ b/flang/test/Semantics/critical04.f90 @@ -1,5 +1,4 @@ -! 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) diff --git a/flang/test/Semantics/doconcurrent02.f90 b/flang/test/Semantics/doconcurrent02.f90 --- a/flang/test/Semantics/doconcurrent02.f90 +++ b/flang/test/Semantics/doconcurrent02.f90 @@ -1,8 +1,6 @@ -! 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 diff --git a/flang/test/Semantics/doconcurrent03.f90 b/flang/test/Semantics/doconcurrent03.f90 --- a/flang/test/Semantics/doconcurrent03.f90 +++ b/flang/test/Semantics/doconcurrent03.f90 @@ -1,5 +1,4 @@ -! 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 diff --git a/flang/test/Semantics/doconcurrent07.f90 b/flang/test/Semantics/doconcurrent07.f90 --- a/flang/test/Semantics/doconcurrent07.f90 +++ b/flang/test/Semantics/doconcurrent07.f90 @@ -1,5 +1,4 @@ -! 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) diff --git a/flang/test/Semantics/label02.f90 b/flang/test/Semantics/label02.f90 --- a/flang/test/Semantics/label02.f90 +++ b/flang/test/Semantics/label02.f90 @@ -1,7 +1,5 @@ -! 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 diff --git a/flang/test/Semantics/label03.f90 b/flang/test/Semantics/label03.f90 --- a/flang/test/Semantics/label03.f90 +++ b/flang/test/Semantics/label03.f90 @@ -1,7 +1,5 @@ -! 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 diff --git a/flang/test/Semantics/label04.f90 b/flang/test/Semantics/label04.f90 --- a/flang/test/Semantics/label04.f90 +++ b/flang/test/Semantics/label04.f90 @@ -1,7 +1,5 @@ -! 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 diff --git a/flang/test/Semantics/label05.f90 b/flang/test/Semantics/label05.f90 --- a/flang/test/Semantics/label05.f90 +++ b/flang/test/Semantics/label05.f90 @@ -1,7 +1,5 @@ -! 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 diff --git a/flang/test/Semantics/label06.f90 b/flang/test/Semantics/label06.f90 --- a/flang/test/Semantics/label06.f90 +++ b/flang/test/Semantics/label06.f90 @@ -1,7 +1,5 @@ -! 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 diff --git a/flang/test/Semantics/label07.f90 b/flang/test/Semantics/label07.f90 --- a/flang/test/Semantics/label07.f90 +++ b/flang/test/Semantics/label07.f90 @@ -1,7 +1,5 @@ -! 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 diff --git a/flang/test/Semantics/label08.f90 b/flang/test/Semantics/label08.f90 --- a/flang/test/Semantics/label08.f90 +++ b/flang/test/Semantics/label08.f90 @@ -1,7 +1,5 @@ -! 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 diff --git a/flang/test/Semantics/label09.f90 b/flang/test/Semantics/label09.f90 --- a/flang/test/Semantics/label09.f90 +++ b/flang/test/Semantics/label09.f90 @@ -1,5 +1,4 @@ -! 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) diff --git a/flang/test/Semantics/label10.f90 b/flang/test/Semantics/label10.f90 --- a/flang/test/Semantics/label10.f90 +++ b/flang/test/Semantics/label10.f90 @@ -1,5 +1,4 @@ -! 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' diff --git a/flang/test/Semantics/label12.f90 b/flang/test/Semantics/label12.f90 --- a/flang/test/Semantics/label12.f90 +++ b/flang/test/Semantics/label12.f90 @@ -1,5 +1,4 @@ -! 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 diff --git a/flang/test/Semantics/label13.f90 b/flang/test/Semantics/label13.f90 --- a/flang/test/Semantics/label13.f90 +++ b/flang/test/Semantics/label13.f90 @@ -1,5 +1,4 @@ -! 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 diff --git a/flang/test/Semantics/label14.f90 b/flang/test/Semantics/label14.f90 --- a/flang/test/Semantics/label14.f90 +++ b/flang/test/Semantics/label14.f90 @@ -1,9 +1,8 @@ -! 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