llvm-fortran · ppenzin · Nov 28, 2019 · Nov 28, 2019
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -1,6 +1,6 @@
 configure_lit_site_cfg(
-  ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
-  ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
+  ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in
+  ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg.py
   )
 
 configure_file(TestRunner.sh.in ${CMAKE_CURRENT_BINARY_DIR}/TestRunner.sh)
@@ -15,7 +15,7 @@ list(APPEND FORT_TEST_DEPS
   )
 
 set(FORT_TEST_PARAMS
-  fort_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
+  fort_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg.py
   )
 
 if( NOT FORT_BUILT_STANDALONE )

diff --git a/test/CodeGen/Intrinsics/bitops.f95 b/test/CodeGen/Intrinsics/bitops.f95
@@ -1,4 +1,4 @@
-! RUN: %fort -emit-llvm -o - %s | %file_check %s
+! RUN: %fort -emit-llvm -o - %s | FileCheck %s
 
 PROGRAM bittest
 

diff --git a/test/CodeGen/Intrinsics/inquiry.f95 b/test/CodeGen/Intrinsics/inquiry.f95
@@ -1,4 +1,4 @@
-! RUN: %fort -emit-llvm -o - %s | %file_check %s
+! RUN: %fort -emit-llvm -o - %s | FileCheck %s
 
 PROGRAM inquirytest
 

diff --git a/test/CodeGen/Intrinsics/maxminloc.f95 b/test/CodeGen/Intrinsics/maxminloc.f95
@@ -1,4 +1,4 @@
-! RUN: %fort -emit-llvm -o - %s | %file_check %s
+! RUN: %fort -emit-llvm -o - %s | FileCheck %s
 
 PROGRAM maxminloctest
 

diff --git a/test/CodeGen/array.f95 b/test/CodeGen/array.f95
@@ -1,4 +1,4 @@
-! RUN: %fort -emit-llvm -o - %s | %file_check %s
+! RUN: %fort -emit-llvm -o - %s | FileCheck %s
 
 PROGRAM helloArrays
 

diff --git a/test/CodeGen/arrayArgument.f95 b/test/CodeGen/arrayArgument.f95
@@ -1,4 +1,4 @@
-! RUN: %fort -emit-llvm -o - %s | %file_check %s
+! RUN: %fort -emit-llvm -o - %s | FileCheck %s
 
 SUBROUTINE SUB(IARR, IARR2, LEN, RARR)
   INTEGER IARR(10), IARR2(*)

diff --git a/test/CodeGen/arrayConstructor.f95 b/test/CodeGen/arrayConstructor.f95
@@ -1,4 +1,4 @@
-! RUN: %fort -emit-llvm -o - %s | %file_check %s
+! RUN: %fort -emit-llvm -o - %s | FileCheck %s
 
 PROGRAM test ! CHECK: private constant [4 x i32] [i32 1, i32 2, i32 3, i32 4]
 

diff --git a/test/CodeGen/callableArguments.f95 b/test/CodeGen/callableArguments.f95
@@ -1,4 +1,4 @@
-! RUN: %fort -emit-llvm -o - %s | %file_check %s
+! RUN: %fort -emit-llvm -o - %s | FileCheck %s
 
 SUBROUTINE SUB(F, G) ! CHECK: void (i32*)* %f, i32 (float*)* %g
   EXTERNAL F

diff --git a/test/CodeGen/character.f95 b/test/CodeGen/character.f95
@@ -1,4 +1,4 @@
-! RUN: %fort -emit-llvm -o - %s | %file_check %s
+! RUN: %fort -emit-llvm -o - %s | FileCheck %s
 
 SUBROUTINE FOO(STR) ! CHECK: define void @foo_(i8* %str, i32 %str.length)
   CHARACTER*(*) STR

diff --git a/test/CodeGen/characterIntrinsic.f95 b/test/CodeGen/characterIntrinsic.f95
@@ -1,4 +1,4 @@
-! RUN: %fort -emit-llvm -o - %s | %file_check %s
+! RUN: %fort -emit-llvm -o - %s | FileCheck %s
 PROGRAM test
   CHARACTER STR
   LOGICAL L

diff --git a/test/CodeGen/common.f95 b/test/CodeGen/common.f95
@@ -1,4 +1,4 @@
-! RUN: %fort -emit-llvm -o - %s | %file_check %s
+! RUN: %fort -emit-llvm -o - %s | FileCheck %s
 
 program com   ! CHECK: @__BLNK__ = common global { i32, i32, float, { float, float } } zeroinitializer, align 16
   integer i,j ! CHECK: @dir_ = common global { [20 x i8], i32 } zeroinitializer, align 16

diff --git a/test/CodeGen/complexArithmetic.f95 b/test/CodeGen/complexArithmetic.f95
@@ -1,4 +1,4 @@
-! RUN: %fort -emit-llvm -o - %s | %file_check %s
+! RUN: %fort -emit-llvm -o - %s | FileCheck %s
 PROGRAM test
   COMPLEX C   ! CHECK: alloca { float, float }
   DOUBLE COMPLEX DC ! CHECK: alloca { double, double }

diff --git a/test/CodeGen/complexIntrinsic.f95 b/test/CodeGen/complexIntrinsic.f95
@@ -1,4 +1,4 @@
-! RUN: %fort -emit-llvm -o - %s | %file_check %s
+! RUN: %fort -emit-llvm -o - %s | FileCheck %s
 PROGRAM testcomplexintrinsics
   COMPLEX c
   INTRINSIC aimag, conjg

diff --git a/test/CodeGen/complexIntrinsicMath.f95 b/test/CodeGen/complexIntrinsicMath.f95
@@ -1,4 +1,4 @@
-! RUN: %fort -emit-llvm -o - -O1 %s | %file_check %s
+! RUN: %fort -emit-llvm -o - -O1 %s | FileCheck %s
 PROGRAM testcomplexintrinsicmath
   COMPLEX c
   INTRINSIC abs, sqrt, sin, cos, log, exp

diff --git a/test/CodeGen/computedGoto.f95 b/test/CodeGen/computedGoto.f95
@@ -1,4 +1,4 @@
-! RUN: %fort -emit-llvm -o - %s | %file_check %s
+! RUN: %fort -emit-llvm -o - %s | FileCheck %s
 PROGRAM gototest
     INTEGER I
 

diff --git a/test/CodeGen/core.f95 b/test/CodeGen/core.f95
@@ -1,4 +1,4 @@
-! RUN: %fort -emit-llvm -o - %s | %file_check %s
+! RUN: %fort -emit-llvm -o - %s | FileCheck %s
 PROGRAM test
   STOP       ! CHECK: call void @libfort_stop()
 END PROGRAM
diff --git a/test/CodeGen/data.f95 b/test/CodeGen/data.f95
@@ -1,4 +1,4 @@
-! RUN: %fort -emit-llvm -o - %s | %file_check %s
+! RUN: %fort -emit-llvm -o - %s | FileCheck %s
 PROGRAM datatest
   INTEGER I, J
   REAL X

diff --git a/test/CodeGen/defaultDouble8.f95 b/test/CodeGen/defaultDouble8.f95
@@ -1,4 +1,4 @@
-! RUN: %fort -fdefault-real-8 -fdefault-double-8 -emit-llvm -o - %s | %file_check %s
+! RUN: %fort -fdefault-real-8 -fdefault-double-8 -emit-llvm -o - %s | FileCheck %s
 
 program test
   real x             ! CHECK:      alloca double

diff --git a/test/CodeGen/defaultInt8.f95 b/test/CodeGen/defaultInt8.f95
@@ -1,4 +1,4 @@
-! RUN: %fort -fdefault-integer-8 -emit-llvm -o - %s | %file_check %s
+! RUN: %fort -fdefault-integer-8 -emit-llvm -o - %s | FileCheck %s
 
 program test
   integer i ! CHECK: alloca i64

diff --git a/test/CodeGen/defaultReal8.f95 b/test/CodeGen/defaultReal8.f95
@@ -1,4 +1,4 @@
-! RUN: %fort -fdefault-real-8 -emit-llvm -o - %s | %file_check %s
+! RUN: %fort -fdefault-real-8 -emit-llvm -o - %s | FileCheck %s
 
 program test
   real x             ! CHECK:      alloca double

diff --git a/test/CodeGen/dowhile.f95 b/test/CodeGen/dowhile.f95
@@ -1,4 +1,4 @@
-! RUN: %fort -emit-llvm -o - %s | %file_check %s
+! RUN: %fort -emit-llvm -o - %s | FileCheck %s
 PROGRAM dowhiletest
   INTEGER I
 

diff --git a/test/CodeGen/equivalence.f95 b/test/CodeGen/equivalence.f95
@@ -1,4 +1,4 @@
-! RUN: %fort -emit-llvm -o - %s | %file_check %s
+! RUN: %fort -emit-llvm -o - %s | FileCheck %s
 
 PROGRAM eqtest
   INTEGER I, J ! CHECK: alloca i8, i64 4, align

diff --git a/test/CodeGen/goto.f95 b/test/CodeGen/goto.f95
@@ -1,4 +1,4 @@
-! RUN: %fort -emit-llvm -o - %s | %file_check %s
+! RUN: %fort -emit-llvm -o - %s | FileCheck %s
 PROGRAM gototest
 
 1000 CONTINUE   ! CHECK: 0:

diff --git a/test/CodeGen/if.f95 b/test/CodeGen/if.f95
@@ -1,4 +1,4 @@
-! RUN: %fort -emit-llvm -o - %s | %file_check %s
+! RUN: %fort -emit-llvm -o - %s | FileCheck %s
 PROGRAM iftest
   INTEGER I
   LOGICAL L

diff --git a/test/CodeGen/implicitConversion.f95 b/test/CodeGen/implicitConversion.f95
@@ -1,4 +1,4 @@
-! RUN: %fort -emit-llvm -o - %s | %file_check %s
+! RUN: %fort -emit-llvm -o - %s | FileCheck %s
 PROGRAM test
   INTEGER I
   REAL X

diff --git a/test/CodeGen/init.f95 b/test/CodeGen/init.f95
@@ -1,4 +1,4 @@
-! RUN: %fort -emit-llvm -o - %s | %file_check %s
+! RUN: %fort -emit-llvm -o - %s | FileCheck %s
 SUBROUTINE sub()
   ! CHECK: @sub_r_ = {{.*}} global float
   ! CHECK: store float 2.500000e+00, float* @sub_r_

diff --git a/test/CodeGen/intrinsicConversion.f95 b/test/CodeGen/intrinsicConversion.f95
@@ -1,4 +1,4 @@
-! RUN: %fort -emit-llvm -o - %s | %file_check %s
+! RUN: %fort -emit-llvm -o - %s | FileCheck %s
 PROGRAM intrinsicconv
   INTEGER I
   REAL R

diff --git a/test/CodeGen/mainProgram.f95 b/test/CodeGen/mainProgram.f95
@@ -1,4 +1,4 @@
-! RUN: %fort -emit-llvm -o - %s | %file_check %s
+! RUN: %fort -emit-llvm -o - %s | FileCheck %s
 PROGRAM test ! CHECK: define i32 @main
   CONTINUE   ! CHECK: br label
 END PROGRAM  ! CHECK: ret i32 0
diff --git a/test/CodeGen/memory.f95 b/test/CodeGen/memory.f95
@@ -1,4 +1,4 @@
-! RUN: %fort %s -O0 -S -emit-llvm -o - | %file_check %s
+! RUN: %fort %s -O0 -S -emit-llvm -o - | FileCheck %s
 program p
   integer(kind=4), allocatable :: a(10), b(5) ! CHECK: %a = alloca i32*
   continue                                    ! CHECK: %b = alloca i32*

diff --git a/test/CodeGen/module.f95 b/test/CodeGen/module.f95
@@ -1,4 +1,4 @@
-! RUN: %fort %s -S -emit-llvm -o - | %file_check %s
+! RUN: %fort %s -S -emit-llvm -o - | FileCheck %s
 module mod
   integer N ! CHECK: @__mod_MOD_n_ = internal global i32
   integer c ! CHECK: @__mod_MOD_c_ = internal global i32

diff --git a/test/CodeGen/save.f95 b/test/CodeGen/save.f95
@@ -1,4 +1,4 @@
-! RUN: %fort -emit-llvm -o - %s | %file_check %s
+! RUN: %fort -emit-llvm -o - %s | FileCheck %s
 
 SUBROUTINE SUB()  ! CHECK: @sub_i_ = {{.*}} global i32
   INTEGER I       ! CHECK: @sub_r_ = {{.*}} global float

diff --git a/test/CodeGen/scalarArithmetic.f95 b/test/CodeGen/scalarArithmetic.f95
@@ -1,4 +1,4 @@
-! RUN: %fort -emit-llvm -o - %s | %file_check %s
+! RUN: %fort -emit-llvm -o - %s | FileCheck %s
 PROGRAM test
   INTEGER X ! CHECK: alloca i32
   REAL Y    ! CHECK: alloca float

diff --git a/test/CodeGen/scalarIntrinsicMath.f95 b/test/CodeGen/scalarIntrinsicMath.f95
@@ -1,4 +1,4 @@
-! RUN: %fort -emit-llvm -o - %s | %file_check %s
+! RUN: %fort -emit-llvm -o - %s | FileCheck %s
 PROGRAM testscalarmath
   INTEGER i
   REAL x

diff --git a/test/CodeGen/scalarIntrinsicTruncRound.f95 b/test/CodeGen/scalarIntrinsicTruncRound.f95
@@ -1,4 +1,4 @@
-! RUN: %fort -emit-llvm -o - %s | %file_check %s
+! RUN: %fort -emit-llvm -o - %s | FileCheck %s
 PROGRAM testscalartruncround
   INTEGER i
   REAL x

diff --git a/test/CodeGen/scalarLogical.f95 b/test/CodeGen/scalarLogical.f95
@@ -1,4 +1,4 @@
-! RUN: %fort -emit-llvm -o - %s | %file_check %s
+! RUN: %fort -emit-llvm -o - %s | FileCheck %s
 PROGRAM test
   LOGICAL L            ! CHECK: alloca i32
   INTEGER I

diff --git a/test/CodeGen/selectcase.f95 b/test/CodeGen/selectcase.f95
@@ -1,4 +1,4 @@
-! RUN: %fort -emit-llvm -o - %s | %file_check %s
+! RUN: %fort -emit-llvm -o - %s | FileCheck %s
 PROGRAM test
   INTEGER I, J
   CHARACTER (Len = 10) STR, NAME

diff --git a/test/CodeGen/statementFunctions.f95 b/test/CodeGen/statementFunctions.f95
@@ -1,4 +1,4 @@
-! RUN: %fort -emit-llvm -o - %s | %file_check %s
+! RUN: %fort -emit-llvm -o - %s | FileCheck %s
 PROGRAM test
   X(I) = I + 1
   COMPLEX A

diff --git a/test/CodeGen/subprogram.f95 b/test/CodeGen/subprogram.f95
@@ -1,4 +1,4 @@
-! RUN: %fort -emit-llvm -o - %s | %file_check %s
+! RUN: %fort -emit-llvm -o - %s | FileCheck %s
 
 SUBROUTINE SUB ! CHECK: define void @sub_()
 END            ! CHECK: ret void

diff --git a/test/CodeGen/systemIntrinsics.f95 b/test/CodeGen/systemIntrinsics.f95
@@ -1,4 +1,4 @@
-! RUN: %fort -emit-llvm -o - %s | %file_check %s
+! RUN: %fort -emit-llvm -o - %s | FileCheck %s
 
 PROGRAM sys ! CHECK: call void @libfort_sys_init()
 

diff --git a/test/CodeGen/type.f95 b/test/CodeGen/type.f95
@@ -1,4 +1,4 @@
-! RUN: %fort -emit-llvm -o - %s | %file_check %s
+! RUN: %fort -emit-llvm -o - %s | FileCheck %s
 
 program typeTest
 

diff --git a/test/CodeGen/use.f95 b/test/CodeGen/use.f95
@@ -1,4 +1,4 @@
-! RUN: %fort %s -S -emit-llvm -o - | %file_check %s
+! RUN: %fort %s -S -emit-llvm -o - | FileCheck %s
 module m
   integer n ! CHECK: @__m_MOD_n_ = internal global i32
   contains

diff --git a/test/CodeGen/valueAssignment.f95 b/test/CodeGen/valueAssignment.f95
@@ -1,4 +1,4 @@
-! RUN: %fort -emit-llvm -o - %s | %file_check %s
+! RUN: %fort -emit-llvm -o - %s | FileCheck %s
 PROGRAM test
   INTEGER X
   REAL Y

diff --git a/test/CodeGen/x86LinuxAggregateABI.f95 b/test/CodeGen/x86LinuxAggregateABI.f95
@@ -1,4 +1,4 @@
-! RUN: %fort -triple "i686-unknown-linux" -emit-llvm -o - %s | %file_check %s
+! RUN: %fort -triple "i686-unknown-linux" -emit-llvm -o - %s | FileCheck %s
 
 complex function foo() ! CHECK: define void @foo_({ float, float }*
   foo = (1.0, 2.0)

diff --git a/test/CodeGen/x86_64LinuxAggregateABI.f95 b/test/CodeGen/x86_64LinuxAggregateABI.f95
@@ -1,4 +1,4 @@
-! RUN: %fort -triple "x86_64-unknown-linux" -emit-llvm -o - %s | %file_check %s
+! RUN: %fort -triple "x86_64-unknown-linux" -emit-llvm -o - %s | FileCheck %s
 
 complex function foo() ! CHECK: define <2 x float> @foo_()
   foo = (1.0, 2.0)

diff --git a/test/Driver/args.f95 b/test/Driver/args.f95
@@ -1,4 +1,4 @@
-! RUN: not %fort -flong-nonexistent-command-line-arg %s 2>&1 | %file_check %s -check-prefix=NON-EXISTENT
+! RUN: not %fort -flong-nonexistent-command-line-arg %s 2>&1 | FileCheck %s -check-prefix=NON-EXISTENT
 
 ! NON-EXISTENT: unknown argument: '-flong-nonexistent-command-line-arg'
 
diff --git a/test/Driver/lineLength.f95 b/test/Driver/lineLength.f95
@@ -1,18 +1,18 @@
-! RUN: not %fort -fsyntax-only -ffree-line-length-garbage %s 2>&1 | %file_check %s -check-prefix=VALUE
-! RUN: not %fort -fsyntax-only -ffree-line-length-1parrot %s 2>&1 | %file_check %s -check-prefix=VALUE
-! RUN: not %fort -fsyntax-only -ffixed-line-length-garbage %s 2>&1 | %file_check %s -check-prefix=VALUE
-! RUN: not %fort -fsyntax-only -ffixed-line-length-1parrot %s 2>&1 | %file_check %s -check-prefix=VALUE
+! RUN: not %fort -fsyntax-only -ffree-line-length-garbage %s 2>&1 | FileCheck %s -check-prefix=VALUE
+! RUN: not %fort -fsyntax-only -ffree-line-length-1parrot %s 2>&1 | FileCheck %s -check-prefix=VALUE
+! RUN: not %fort -fsyntax-only -ffixed-line-length-garbage %s 2>&1 | FileCheck %s -check-prefix=VALUE
+! RUN: not %fort -fsyntax-only -ffixed-line-length-1parrot %s 2>&1 | FileCheck %s -check-prefix=VALUE
 
-! RUN: not %fort -fsyntax-only -ffixed-line-length-garbage %s 2>&1 | %file_check %s -check-prefix=VALUE
-! RUN: not %fort -fsyntax-only -ffixed-line-length-1parrot %s 2>&1 | %file_check %s -check-prefix=VALUE
-! RUN: not %fort -fsyntax-only -ffree-line-length-garbage %s 2>&1 | %file_check %s -check-prefix=VALUE
-! RUN: not %fort -fsyntax-only -ffree-line-length-1parrot %s 2>&1 | %file_check %s -check-prefix=VALUE
+! RUN: not %fort -fsyntax-only -ffixed-line-length-garbage %s 2>&1 | FileCheck %s -check-prefix=VALUE
+! RUN: not %fort -fsyntax-only -ffixed-line-length-1parrot %s 2>&1 | FileCheck %s -check-prefix=VALUE
+! RUN: not %fort -fsyntax-only -ffree-line-length-garbage %s 2>&1 | FileCheck %s -check-prefix=VALUE
+! RUN: not %fort -fsyntax-only -ffree-line-length-1parrot %s 2>&1 | FileCheck %s -check-prefix=VALUE
 
-! RUN: not %fort -fsyntax-only -ffree-line-length-1000000000000000000000000 %s 2>&1 | %file_check %s -check-prefix=SIZE
-! RUN: not %fort -fsyntax-only -ffixed-line-length-1000000000000000000000000 %s 2>&1 | %file_check %s -check-prefix=SIZE
+! RUN: not %fort -fsyntax-only -ffree-line-length-1000000000000000000000000 %s 2>&1 | FileCheck %s -check-prefix=SIZE
+! RUN: not %fort -fsyntax-only -ffixed-line-length-1000000000000000000000000 %s 2>&1 | FileCheck %s -check-prefix=SIZE
 
-! RUN: not %fort -fsyntax-only -ffixed-line-length-1000000000000000000000000 %s 2>&1 | %file_check %s -check-prefix=SIZE
-! RUN: not %fort -fsyntax-only -ffree-line-length-1000000000000000000000000 %s 2>&1 | %file_check %s -check-prefix=SIZE
+! RUN: not %fort -fsyntax-only -ffixed-line-length-1000000000000000000000000 %s 2>&1 | FileCheck %s -check-prefix=SIZE
+! RUN: not %fort -fsyntax-only -ffree-line-length-1000000000000000000000000 %s 2>&1 | FileCheck %s -check-prefix=SIZE
 
 ! VALUE: invalid value
 ! SIZE: value '1000000000000000000000000' is too big

diff --git a/test/Lexer/fixedForm2.f b/test/Lexer/fixedForm2.f
@@ -1,5 +1,5 @@
 * RUN: %fort -fsyntax-only %s
-* RUN: %fort -fsyntax-only -ast-print %s 2>&1 | %file_check %s
+* RUN: %fort -fsyntax-only -ast-print %s 2>&1 | FileCheck %s
 * an extract from chemm.f
       SUBROUTINE FOO(M, N, ALPHA, BETA)
       REAL M, N, ALPHA, BETA

diff --git a/test/Lexer/fixedFormSquash.f b/test/Lexer/fixedFormSquash.f
@@ -1,6 +1,6 @@
        PROGRAMfoo
 C RUN: %fort -fsyntax-only %s
-C RUN: %fort -fsyntax-only -ast-print %s 2>&1 | %file_check %s
+C RUN: %fort -fsyntax-only -ast-print %s 2>&1 | FileCheck %s
        INTEGERI,DOI,IDO
 C next line is a DO statement, not DOI =
 C CHECK: do i = 1, 10

diff --git a/test/Lexer/fixedFormString.f b/test/Lexer/fixedFormString.f
@@ -1,6 +1,6 @@
       PROGRAM text
 C RUN: %fort -fsyntax-only %s
-C RUN: %fort -fsyntax-only -ast-print %s 2>&1 | %file_check --strict-whitespace %s
+C RUN: %fort -fsyntax-only -ast-print %s 2>&1 | FileCheck --strict-whitespace %s
       CHARACTER *256 MESS(09)
       DATA MESS(01)/
      .' He llo

diff --git a/test/Lexer/numberConstants.f95 b/test/Lexer/numberConstants.f95
@@ -1,5 +1,5 @@
 ! RUN: %fort -fsyntax-only -verify < %s
-! RUN: %fort -fsyntax-only -verify -ast-print %s 2>&1 | %file_check %s
+! RUN: %fort -fsyntax-only -verify -ast-print %s 2>&1 | FileCheck %s
 PROGRAM constants
   REAL X
   DOUBLE PRECISION Y

diff --git a/test/Parser/end.f b/test/Parser/end.f
@@ -1,5 +1,5 @@
 * RUN: %fort -fsyntax-only %s
-* RUN: %fort -fsyntax-only -ast-print %s 2>&1 | %file_check %s
+* RUN: %fort -fsyntax-only -ast-print %s 2>&1 | FileCheck %s
 
       PROGRAM D
 * CHECK: endd = 0

diff --git a/test/Parser/expressions.f95 b/test/Parser/expressions.f95
@@ -1,5 +1,5 @@
 ! RUN: %fort -fsyntax-only -verify < %s
-! RUN: %fort -fsyntax-only -verify -ast-print %s 2>&1 | %file_check %s
+! RUN: %fort -fsyntax-only -verify -ast-print %s 2>&1 | FileCheck %s
 PROGRAM expressions
   REAL x,y,z,w
   LOGICAL l

diff --git a/test/Parser/fixedFormDo.f b/test/Parser/fixedFormDo.f
@@ -1,5 +1,5 @@
 C RUN: %fort -fsyntax-only %s
-C RUN: %fort -fsyntax-only -ast-print %s 2>&1 | %file_check %s
+C RUN: %fort -fsyntax-only -ast-print %s 2>&1 | FileCheck %s
        PROGRAM test
        INTEGERNE,DOI(10),DONE,DOWHILE,DOWHILEI,WHILEI
        DOI=1,10

diff --git a/test/Parser/fixedFormFunction.f b/test/Parser/fixedFormFunction.f
@@ -1,5 +1,5 @@
 * RUN: %fort -fsyntax-only %s
-* RUN: %fort -fsyntax-only -ast-print %s 2>&1 | %file_check %s
+* RUN: %fort -fsyntax-only -ast-print %s 2>&1 | FileCheck %s
       LOGICALFUNCTIONFOO()
 * CHECK: foo = false
         FOO = .false.

diff --git a/test/Parser/fixedFormLength.f b/test/Parser/fixedFormLength.f
@@ -1,8 +1,8 @@
 * RUN: %fort -fsyntax-only -ffixed-line-length-90 %s
 * RUN: %fort -fsyntax-only -ffixed-line-length-0 %s
 * RUN: %fort -fsyntax-only -ffixed-line-length-none %s
-* RUN: not %fort -fsyntax-only -ffixed-line-length-50 %s 2>&1 | %file_check %s -check-prefix=LINE-LENGTH
-* RUN: not %fort -fsyntax-only %s 2>&1 | %file_check %s -check-prefix=LINE-LENGTH
+* RUN: not %fort -fsyntax-only -ffixed-line-length-50 %s 2>&1 | FileCheck %s -check-prefix=LINE-LENGTH
+* RUN: not %fort -fsyntax-only %s 2>&1 | FileCheck %s -check-prefix=LINE-LENGTH
 
       PROGRAM test
       CHARACTER *72 STR

diff --git a/test/Parser/fixedif.f b/test/Parser/fixedif.f
@@ -1,5 +1,5 @@
 * RUN: %fort -fsyntax-only %s
-* RUN: %fort -fsyntax-only -ast-print %s 2>&1 | %file_check %s
+* RUN: %fort -fsyntax-only -ast-print %s 2>&1 | FileCheck %s
       PROGRAM iftest
 * an implicit integer declaration.
 * CHECK: ifatal = 0

diff --git a/test/Parser/freeFormLength.f95 b/test/Parser/freeFormLength.f95
@@ -2,8 +2,8 @@
 ! RUN: %fort -fsyntax-only -ffree-line-length-0 %s
 ! RUN: %fort -fsyntax-only -ffree-line-length-none %s
 
-! RUN: not %fort -fsyntax-only -ffree-line-length-100 %s 2>&1 | %file_check %s -check-prefix=LINE-LENGTH
-! RUN: not %fort -fsyntax-only %s 2>&1 | %file_check %s -check-prefix=LINE-LENGTH
+! RUN: not %fort -fsyntax-only -ffree-line-length-100 %s 2>&1 | FileCheck %s -check-prefix=LINE-LENGTH
+! RUN: not %fort -fsyntax-only %s 2>&1 | FileCheck %s -check-prefix=LINE-LENGTH
 
 program test
   character(len=126) :: str