diff --git a/flang/test/Semantics/doconcurrent04.f90 b/flang/test/Semantics/doconcurrent04.f90 --- a/flang/test/Semantics/doconcurrent04.f90 +++ b/flang/test/Semantics/doconcurrent04.f90 @@ -1,7 +1,6 @@ -! 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 diff --git a/flang/test/Semantics/label01.F90 b/flang/test/Semantics/label01.F90 --- a/flang/test/Semantics/label01.F90 +++ b/flang/test/Semantics/label01.F90 @@ -1,9 +1,5 @@ -! 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 -DARCHAIC_FORTRAN -funparse-with-symbols %s 2>&1 | FileCheck %s +! CHECK-NOT: error:{{[[:space:]]}} ! these are the conformance tests ! define STRICT_F18 to eliminate tests of features not in F18 diff --git a/flang/test/Semantics/label11.f90 b/flang/test/Semantics/label11.f90 --- a/flang/test/Semantics/label11.f90 +++ b/flang/test/Semantics/label11.f90 @@ -1,12 +1,11 @@ -! 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