From c496510c71da0e232517f15e34159729bc34e8dc Mon Sep 17 00:00:00 2001
From: Petr Penzin <penzin.dev@gmail.com>
Date: Wed, 27 Nov 2019 21:37:11 -0800
Subject: [PATCH] Use FileCheck directly

---
 test/CMakeLists.txt                          |  6 ++---
 test/CodeGen/Intrinsics/bitops.f95           |  2 +-
 test/CodeGen/Intrinsics/inquiry.f95          |  2 +-
 test/CodeGen/Intrinsics/maxminloc.f95        |  2 +-
 test/CodeGen/array.f95                       |  2 +-
 test/CodeGen/arrayArgument.f95               |  2 +-
 test/CodeGen/arrayConstructor.f95            |  2 +-
 test/CodeGen/callableArguments.f95           |  2 +-
 test/CodeGen/character.f95                   |  2 +-
 test/CodeGen/characterIntrinsic.f95          |  2 +-
 test/CodeGen/common.f95                      |  2 +-
 test/CodeGen/complexArithmetic.f95           |  2 +-
 test/CodeGen/complexIntrinsic.f95            |  2 +-
 test/CodeGen/complexIntrinsicMath.f95        |  2 +-
 test/CodeGen/computedGoto.f95                |  2 +-
 test/CodeGen/core.f95                        |  2 +-
 test/CodeGen/data.f95                        |  2 +-
 test/CodeGen/defaultDouble8.f95              |  2 +-
 test/CodeGen/defaultInt8.f95                 |  2 +-
 test/CodeGen/defaultReal8.f95                |  2 +-
 test/CodeGen/dowhile.f95                     |  2 +-
 test/CodeGen/equivalence.f95                 |  2 +-
 test/CodeGen/goto.f95                        |  2 +-
 test/CodeGen/if.f95                          |  2 +-
 test/CodeGen/implicitConversion.f95          |  2 +-
 test/CodeGen/init.f95                        |  2 +-
 test/CodeGen/intrinsicConversion.f95         |  2 +-
 test/CodeGen/mainProgram.f95                 |  2 +-
 test/CodeGen/memory.f95                      |  2 +-
 test/CodeGen/module.f95                      |  2 +-
 test/CodeGen/save.f95                        |  2 +-
 test/CodeGen/scalarArithmetic.f95            |  2 +-
 test/CodeGen/scalarIntrinsicMath.f95         |  2 +-
 test/CodeGen/scalarIntrinsicTruncRound.f95   |  2 +-
 test/CodeGen/scalarLogical.f95               |  2 +-
 test/CodeGen/selectcase.f95                  |  2 +-
 test/CodeGen/statementFunctions.f95          |  2 +-
 test/CodeGen/subprogram.f95                  |  2 +-
 test/CodeGen/systemIntrinsics.f95            |  2 +-
 test/CodeGen/type.f95                        |  2 +-
 test/CodeGen/use.f95                         |  2 +-
 test/CodeGen/valueAssignment.f95             |  2 +-
 test/CodeGen/x86LinuxAggregateABI.f95        |  2 +-
 test/CodeGen/x86_64LinuxAggregateABI.f95     |  2 +-
 test/Driver/args.f95                         |  2 +-
 test/Driver/lineLength.f95                   | 24 ++++++++++----------
 test/Lexer/fixedForm2.f                      |  2 +-
 test/Lexer/fixedFormSquash.f                 |  2 +-
 test/Lexer/fixedFormString.f                 |  2 +-
 test/Lexer/numberConstants.f95               |  2 +-
 test/Parser/end.f                            |  2 +-
 test/Parser/expressions.f95                  |  2 +-
 test/Parser/fixedFormDo.f                    |  2 +-
 test/Parser/fixedFormFunction.f              |  2 +-
 test/Parser/fixedFormLength.f                |  4 ++--
 test/Parser/fixedif.f                        |  2 +-
 test/Parser/freeFormLength.f95               |  4 ++--
 test/Parser/implicitFunctions.f95            |  2 +-
 test/Parser/module.f95                       |  2 +-
 test/Parser/save.f                           |  2 +-
 test/Sema/Intrinsics/bitops.f95              |  2 +-
 test/Sema/Intrinsics/inquiry.f95             |  2 +-
 test/Sema/arithmeticExpressions.f95          |  2 +-
 test/Sema/arrayOperations.f95                |  2 +-
 test/Sema/arraySections.f95                  |  2 +-
 test/Sema/arraySpec.f95                      |  2 +-
 test/Sema/assignment.f95                     |  2 +-
 test/Sema/data.f95                           |  2 +-
 test/Sema/declarationAttributes.f95          |  2 +-
 test/Sema/dimension.f95                      |  2 +-
 test/Sema/do.f95                             |  2 +-
 test/Sema/double.f95                         |  2 +-
 test/Sema/dynamicAssociation.f95             |  2 +-
 test/Sema/external.f95                       |  2 +-
 test/Sema/implicit.f95                       |  2 +-
 test/Sema/implicitDefault.f95                |  2 +-
 test/Sema/init.f95                           |  2 +-
 test/Sema/intrinsicArrayOperations.f95       |  2 +-
 test/Sema/intrinsicFunctions.f95             |  2 +-
 test/Sema/relationalExpressions.f95          |  2 +-
 test/Sema/result.f95                         |  2 +-
 test/Sema/save.f95                           |  2 +-
 test/Sema/statementFunctions.f95             |  2 +-
 test/Sema/subprogram.f95                     |  2 +-
 test/Sema/type.f95                           |  2 +-
 test/Sema/typeKinds.f95                      |  2 +-
 test/{lit.cfg => lit.cfg.py}                 |  1 -
 test/{lit.site.cfg.in => lit.site.cfg.py.in} |  3 +--
 88 files changed, 102 insertions(+), 104 deletions(-)
 rename test/{lit.cfg => lit.cfg.py} (98%)
 rename test/{lit.site.cfg.in => lit.site.cfg.py.in} (87%)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index e95fe74..dcfc940 100644
--- 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
index aadc81b..f16bd6e 100644
--- 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
index 573b29b..7a74e7a 100644
--- 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
index ac24fd0..be7f342 100644
--- 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
index ce2bae2..686a0b7 100644
--- 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
index 62a2d23..66580eb 100644
--- 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
index 31056e2..6a15450 100644
--- 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
index a2de5e8..b02fef5 100644
--- 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
index c51d8bd..1a1c68b 100644
--- 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
index 42db832..7e7d466 100644
--- 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
index a2eb204..bece4bf 100644
--- 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
index 7d7c847..7eba170 100644
--- 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
index f49224d..565d9e4 100644
--- 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
index 7379624..e84ce6b 100644
--- 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
index d0da227..f38b9df 100644
--- 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
index 098b4ff..8014154 100644
--- 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
index afca5bd..482411f 100644
--- 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
index 54d1963..24c7ba1 100644
--- 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
index c04e6c3..2482edd 100644
--- 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
index 1295fc1..9056288 100644
--- 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
index 8c30380..4c35497 100644
--- 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
index 0834d3a..cffc2ff 100644
--- 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
index 2ec96ac..97d05c3 100644
--- 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
index d79beb6..7ad7921 100644
--- 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
index e73a041..a5daa00 100644
--- 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
index fc8c784..0e495d8 100644
--- 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
index 9e01692..4a2e555 100644
--- 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
index 6390460..72c5f3e 100644
--- 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
index d0b95ae..51bc8bc 100644
--- 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
index d044f00..cbbec83 100644
--- 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
index 89e15b7..5c4f195 100644
--- 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
index 4978609..ee4e155 100644
--- 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
index d923c1a..3ff2bec 100644
--- 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
index 8fcda97..3a141a0 100644
--- 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
index b636167..4fa05cf 100644
--- 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
index 41c21ec..22e11e6 100644
--- 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
index 3a28c82..2c2801e 100644
--- 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
index a94f877..62b1854 100644
--- 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
index 91ac7fc..7a10a39 100644
--- 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
index fd1ca38..a889938 100644
--- 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
index 18ae1cd..ac45dbd 100644
--- 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
index 399df69..067546f 100644
--- 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
index 47d757b..6ddf71b 100644
--- 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
index 2294171..acfb6cb 100644
--- 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
index 95473ac..0bcaa88 100644
--- 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
index 45c44f7..303c68e 100644
--- 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
index a8c41c7..8048f93 100644
--- 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
index 4b19c1b..05c4598 100644
--- 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
index 0aaf9c4..7202661 100644
--- 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
index 3c44a57..449080d 100644
--- 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
index 0d6c138..5f10a24 100644
--- 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
index 8772043..6aacf99 100644
--- 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
index d3dcced..525870d 100644
--- 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
index 9705b21..811580b 100644
--- 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
index 8c6feb6..b436a84 100644
--- 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
index 3851caf..bdbb5d2 100644
--- 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
index 13246b3..6fce38a 100644
--- 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
diff --git a/test/Parser/implicitFunctions.f95 b/test/Parser/implicitFunctions.f95
index e1f6743..65405f3 100644
--- a/test/Parser/implicitFunctions.f95
+++ b/test/Parser/implicitFunctions.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 imptest
   integer i
diff --git a/test/Parser/module.f95 b/test/Parser/module.f95
index da094c0..42397c8 100644
--- a/test/Parser/module.f95
+++ b/test/Parser/module.f95
@@ -1,5 +1,5 @@
 ! RUN: %fort -fsyntax-only -verify %s
-! RUN: %fort -fsyntax-only -verify %s -ast-print 2>&1 | %file_check %s
+! RUN: %fort -fsyntax-only -verify %s -ast-print 2>&1 | FileCheck %s
 module e   ! CHECK: module e
 end module ! CHECK: end module
 module c   ! CHECK: module c
diff --git a/test/Parser/save.f b/test/Parser/save.f
index e020e22..e699fa2 100644
--- a/test/Parser/save.f
+++ b/test/Parser/save.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
 
        SUBROUTINE FOO
        INTEGER SAVEALPHA
diff --git a/test/Sema/Intrinsics/bitops.f95 b/test/Sema/Intrinsics/bitops.f95
index fd3177f..7f4651a 100644
--- a/test/Sema/Intrinsics/bitops.f95
+++ b/test/Sema/Intrinsics/bitops.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 test
   intrinsic iand, ieor, ior
diff --git a/test/Sema/Intrinsics/inquiry.f95 b/test/Sema/Intrinsics/inquiry.f95
index 9ae9033..230d795 100644
--- a/test/Sema/Intrinsics/inquiry.f95
+++ b/test/Sema/Intrinsics/inquiry.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 test
   intrinsic kind, bit_size
diff --git a/test/Sema/arithmeticExpressions.f95 b/test/Sema/arithmeticExpressions.f95
index 4feba96..38af1ab 100644
--- a/test/Sema/arithmeticExpressions.f95
+++ b/test/Sema/arithmeticExpressions.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 arithexpressions
   IMPLICIT NONE
   INTEGER i
diff --git a/test/Sema/arrayOperations.f95 b/test/Sema/arrayOperations.f95
index 75df281..684485a 100644
--- a/test/Sema/arrayOperations.f95
+++ b/test/Sema/arrayOperations.f95
@@ -1,5 +1,5 @@
 ! RUN: %fort -fsyntax-only -verify < %s
-! RUN: %fort -fsyntax-only -verify -ast-dump %s 2>&1 | %file_check %s
+! RUN: %fort -fsyntax-only -verify -ast-dump %s 2>&1 | FileCheck %s
 
 SUBROUTINE foo(I_ARR)
   INTEGER I_ARR(*)
diff --git a/test/Sema/arraySections.f95 b/test/Sema/arraySections.f95
index 24a64fd..3a40471 100644
--- a/test/Sema/arraySections.f95
+++ b/test/Sema/arraySections.f95
@@ -1,5 +1,5 @@
 ! RUN: %fort -fsyntax-only -verify < %s
-! RUN: %fort -fsyntax-only -verify -ast-dump %s 2>&1 | %file_check %s
+! RUN: %fort -fsyntax-only -verify -ast-dump %s 2>&1 | FileCheck %s
 
 SUBROUTINE foo(I_ARR)
   INTEGER I_ARR(*)
diff --git a/test/Sema/arraySpec.f95 b/test/Sema/arraySpec.f95
index f436297..7951ed9 100644
--- a/test/Sema/arraySpec.f95
+++ b/test/Sema/arraySpec.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
 
 SUBROUTINE SUB(ARR, ARR2, ARR3)
   INTEGER ARR(*)
diff --git a/test/Sema/assignment.f95 b/test/Sema/assignment.f95
index e3bbd21..48935f4 100644
--- a/test/Sema/assignment.f95
+++ b/test/Sema/assignment.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 assignment
   IMPLICIT NONE
   INTEGER i
diff --git a/test/Sema/data.f95 b/test/Sema/data.f95
index 5427cc1..c07f133 100644
--- a/test/Sema/data.f95
+++ b/test/Sema/data.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 datatest
   INTEGER I, J, K, M, NNN, O, P, Q
diff --git a/test/Sema/declarationAttributes.f95 b/test/Sema/declarationAttributes.f95
index 42eee93..ba2fc45 100644
--- a/test/Sema/declarationAttributes.f95
+++ b/test/Sema/declarationAttributes.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 declAttrTest
 
diff --git a/test/Sema/dimension.f95 b/test/Sema/dimension.f95
index 812ae3c..a05575a 100644
--- a/test/Sema/dimension.f95
+++ b/test/Sema/dimension.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 dimtest
   IMPLICIT NONE
diff --git a/test/Sema/do.f95 b/test/Sema/do.f95
index b287c9a..79b9b58 100644
--- a/test/Sema/do.f95
+++ b/test/Sema/do.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 dotest
     INTEGER I, II, K
     REAL R
diff --git a/test/Sema/double.f95 b/test/Sema/double.f95
index ff37d23..5a14830 100644
--- a/test/Sema/double.f95
+++ b/test/Sema/double.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
 ! This is more focused on double complex support and some
 ! obscure intrinsic overloads used by BLAS
 PROGRAM doubletest
diff --git a/test/Sema/dynamicAssociation.f95 b/test/Sema/dynamicAssociation.f95
index 6427947..afbe60d 100644
--- a/test/Sema/dynamicAssociation.f95
+++ b/test/Sema/dynamicAssociation.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 a
   implicit none
   integer, allocatable :: a(10), c(5) ! CHECK: integer, allocatable array a
diff --git a/test/Sema/external.f95 b/test/Sema/external.f95
index de492a0..d1bcc75 100644
--- a/test/Sema/external.f95
+++ b/test/Sema/external.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 exttest
   EXTERNAL SUB
 
diff --git a/test/Sema/implicit.f95 b/test/Sema/implicit.f95
index a3f2b0d..3f790ac 100644
--- a/test/Sema/implicit.f95
+++ b/test/Sema/implicit.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 imptest
   IMPLICIT INTEGER (A, B)
   IMPLICIT REAL (C-E, F)
diff --git a/test/Sema/implicitDefault.f95 b/test/Sema/implicitDefault.f95
index 78d8254..8c65091 100644
--- a/test/Sema/implicitDefault.f95
+++ b/test/Sema/implicitDefault.f95
@@ -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 imptest
   !Unless specified otherwise,
   !all variables starting with letters I, J, K, L, M and N are default INTEGERs,
diff --git a/test/Sema/init.f95 b/test/Sema/init.f95
index 59c5621..a8a58d1 100644
--- a/test/Sema/init.f95
+++ b/test/Sema/init.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 init
   INTEGER n = 1 ! expected-error {{expected line break or ';' at end of statement}}
   INTEGER var ! expected-note@+1 {{this expression is not allowed in a constant expression}}
diff --git a/test/Sema/intrinsicArrayOperations.f95 b/test/Sema/intrinsicArrayOperations.f95
index 0de6bc8..6e76569 100644
--- a/test/Sema/intrinsicArrayOperations.f95
+++ b/test/Sema/intrinsicArrayOperations.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 intrinfuntest
   integer i_mat(4,4), i_arr(5)
   integer(8) i64
diff --git a/test/Sema/intrinsicFunctions.f95 b/test/Sema/intrinsicFunctions.f95
index a409617..bd8d467 100644
--- a/test/Sema/intrinsicFunctions.f95
+++ b/test/Sema/intrinsicFunctions.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 intrinfuntest
   INTEGER i
   REAL r
diff --git a/test/Sema/relationalExpressions.f95 b/test/Sema/relationalExpressions.f95
index 8cd1f09..6952365 100644
--- a/test/Sema/relationalExpressions.f95
+++ b/test/Sema/relationalExpressions.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 relexpressions
   IMPLICIT NONE
   INTEGER i
diff --git a/test/Sema/result.f95 b/test/Sema/result.f95
index 118d52c..d22ae4b 100644
--- a/test/Sema/result.f95
+++ b/test/Sema/result.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
 
 INTEGER FUNCTION FOO() RESULT(I)
   I = 1 ! CHECK: i = 1
diff --git a/test/Sema/save.f95 b/test/Sema/save.f95
index c1004eb..ce84a69 100644
--- a/test/Sema/save.f95
+++ b/test/Sema/save.f95
@@ -1,5 +1,5 @@
 ! RUN: %fort -verify -fsyntax-only < %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
 
 SUBROUTINE FOO
   INTEGER I
diff --git a/test/Sema/statementFunctions.f95 b/test/Sema/statementFunctions.f95
index ed02565..8f8ba57 100644
--- a/test/Sema/statementFunctions.f95
+++ b/test/Sema/statementFunctions.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 test
   X(I) = I+2 ! CHECK: real((i+2))
   Y(A) = 1.0 ! CHECK: 1
diff --git a/test/Sema/subprogram.f95 b/test/Sema/subprogram.f95
index cea6fd0..bd983f0 100644
--- a/test/Sema/subprogram.f95
+++ b/test/Sema/subprogram.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
 SUBROUTINE FOO(X,Y)
   REAL X,Y
 END
diff --git a/test/Sema/type.f95 b/test/Sema/type.f95
index 5cf5ba3..f861b3f 100644
--- a/test/Sema/type.f95
+++ b/test/Sema/type.f95
@@ -1,5 +1,5 @@
 ! RUN: %fort -verify -fsyntax-only < %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
 
 function swap(p)
   type ipoint
diff --git a/test/Sema/typeKinds.f95 b/test/Sema/typeKinds.f95
index 33f6206..e42953e 100644
--- a/test/Sema/typeKinds.f95
+++ b/test/Sema/typeKinds.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
 
 REAL(Kind=8) FUNCTION A()
   A = 1.0 ! CHECK: a = real(1,Kind=8)
diff --git a/test/lit.cfg b/test/lit.cfg.py
similarity index 98%
rename from test/lit.cfg
rename to test/lit.cfg.py
index 4161e71..898c057 100644
--- a/test/lit.cfg
+++ b/test/lit.cfg.py
@@ -135,7 +135,6 @@ def inferFort(PATH):
     lit_config.note('using fort: %r' % config.fort)
 config.substitutions.append( ('%fort', ' ' + config.fort + ' ') )
 config.substitutions.append( ('%test_dir', config.test_dir) )
-config.substitutions.append( ('%file_check', config.file_check) )
 config.substitutions.append( ('%test_debuginfo', ' ' + config.llvm_src_root + '/utils/test_debuginfo.pl ') )
 
 # FIXME: Find nicer way to prohibit this.
diff --git a/test/lit.site.cfg.in b/test/lit.site.cfg.py.in
similarity index 87%
rename from test/lit.site.cfg.in
rename to test/lit.site.cfg.py.in
index ce824f6..155324d 100644
--- a/test/lit.site.cfg.in
+++ b/test/lit.site.cfg.py.in
@@ -19,6 +19,5 @@ except KeyError:
 
 # Let the main config do the real work.
 config.test_dir = "@FORT_SOURCE_DIR@/test"
-config.file_check = "@FORT_BINARY_DIR@/bin/FileCheck"
-lit_config.load_config(config, "@FORT_SOURCE_DIR@/test/lit.cfg")
+lit_config.load_config(config, "@FORT_SOURCE_DIR@/test/lit.cfg.py")