[llvm-branch-commits] [flang] 1c8f199 - [flang][driver] Update PP tests to use the new driver
Faris Rehman via llvm-branch-commits
llvm-branch-commits at lists.llvm.org
Mon Jan 25 04:38:28 PST 2021
Author: Faris Rehman
Date: 2021-01-25T12:32:23Z
New Revision: 1c8f199f449916d30ec12ecc5bb0f157ab1d01a0
URL: https://github.com/llvm/llvm-project/commit/1c8f199f449916d30ec12ecc5bb0f157ab1d01a0
DIFF: https://github.com/llvm/llvm-project/commit/1c8f199f449916d30ec12ecc5bb0f157ab1d01a0.diff
LOG: [flang][driver] Update PP tests to use the new driver
Update the preprocessor regression tests to use the new driver if the new driver is built (FLANG_BUILD_NEW_DRIVER=On), otherwise the tests will still run using f18.
Summary of changes:
- Introduce %flang to the regression tests, which points to the new driver if it is built or otherwise points to f18
- Update all tests in flang/test/Preprocessing/ to use %flang
Differential Revision: https://reviews.llvm.org/D94805
Added:
Modified:
flang/test/Preprocessing/assert.F90
flang/test/Preprocessing/compiler_defined_macros.F90
flang/test/Preprocessing/defines.F90
flang/test/Preprocessing/fixed-rescan.F
flang/test/Preprocessing/hollerith.f
flang/test/Preprocessing/include-comment.F90
flang/test/Preprocessing/pp001.F
flang/test/Preprocessing/pp002.F
flang/test/Preprocessing/pp003.F
flang/test/Preprocessing/pp004.F
flang/test/Preprocessing/pp005.F
flang/test/Preprocessing/pp006.F
flang/test/Preprocessing/pp007.F
flang/test/Preprocessing/pp008.F
flang/test/Preprocessing/pp009.F
flang/test/Preprocessing/pp010.F
flang/test/Preprocessing/pp011.F
flang/test/Preprocessing/pp012.F
flang/test/Preprocessing/pp013.F
flang/test/Preprocessing/pp014.F
flang/test/Preprocessing/pp015.F
flang/test/Preprocessing/pp016.F
flang/test/Preprocessing/pp017.F
flang/test/Preprocessing/pp018.F
flang/test/Preprocessing/pp019.F
flang/test/Preprocessing/pp020.F
flang/test/Preprocessing/pp021.F
flang/test/Preprocessing/pp022.F
flang/test/Preprocessing/pp023.F
flang/test/Preprocessing/pp024.F
flang/test/Preprocessing/pp025.F
flang/test/Preprocessing/pp026.F
flang/test/Preprocessing/pp027.F
flang/test/Preprocessing/pp028.F
flang/test/Preprocessing/pp029.F
flang/test/Preprocessing/pp030.F
flang/test/Preprocessing/pp031.F
flang/test/Preprocessing/pp032.F
flang/test/Preprocessing/pp033.F
flang/test/Preprocessing/pp034.F
flang/test/Preprocessing/pp035.F
flang/test/Preprocessing/pp036.F
flang/test/Preprocessing/pp037.F
flang/test/Preprocessing/pp038.F
flang/test/Preprocessing/pp039.F
flang/test/Preprocessing/pp040.F
flang/test/Preprocessing/pp041.F
flang/test/Preprocessing/pp042.F
flang/test/Preprocessing/pp043.F
flang/test/Preprocessing/pp044.F
flang/test/Preprocessing/pp101.F90
flang/test/Preprocessing/pp102.F90
flang/test/Preprocessing/pp103.F90
flang/test/Preprocessing/pp104.F90
flang/test/Preprocessing/pp105.F90
flang/test/Preprocessing/pp106.F90
flang/test/Preprocessing/pp107.F90
flang/test/Preprocessing/pp108.F90
flang/test/Preprocessing/pp109.F90
flang/test/Preprocessing/pp110.F90
flang/test/Preprocessing/pp111.F90
flang/test/Preprocessing/pp112.F90
flang/test/Preprocessing/pp113.F90
flang/test/Preprocessing/pp114.F90
flang/test/Preprocessing/pp115.F90
flang/test/Preprocessing/pp116.F90
flang/test/Preprocessing/pp117.F90
flang/test/Preprocessing/pp118.F90
flang/test/Preprocessing/pp119.F90
flang/test/Preprocessing/pp120.F90
flang/test/Preprocessing/pp121.F90
flang/test/Preprocessing/pp122.F90
flang/test/Preprocessing/pp123.F90
flang/test/Preprocessing/pp124.F90
flang/test/Preprocessing/pp125.F90
flang/test/Preprocessing/pp126.F90
flang/test/Preprocessing/pp127.F90
flang/test/Preprocessing/pp128.F90
flang/test/Preprocessing/pp129.F90
flang/test/Preprocessing/pp130.F90
flang/test/lit.cfg.py
Removed:
################################################################################
diff --git a/flang/test/Preprocessing/assert.F90 b/flang/test/Preprocessing/assert.F90
index 64d49e6f1cbd..5d4837efd6d5 100644
--- a/flang/test/Preprocessing/assert.F90
+++ b/flang/test/Preprocessing/assert.F90
@@ -1,4 +1,4 @@
-!RUN: %f18 -E %s 2>&1 | FileCheck %s
+!RUN: %flang -E %s 2>&1 | FileCheck %s
!CHECK: if(.not.(.true.)) error stop "assert(" // ".TRUE." // ") failed " // "at ""
!CHECK-SAME: assert.F90"": " // "7"
#define STR(x) #x
diff --git a/flang/test/Preprocessing/compiler_defined_macros.F90 b/flang/test/Preprocessing/compiler_defined_macros.F90
index ba20f6d39622..f5f955bbc750 100644
--- a/flang/test/Preprocessing/compiler_defined_macros.F90
+++ b/flang/test/Preprocessing/compiler_defined_macros.F90
@@ -3,7 +3,7 @@
!CHECK: flang_major = {{[1-9][0-9]*$}}
!CHECK: flang_minor = {{[0-9]+$}}
!CHECK: flang_patchlevel = {{[0-9]+$}}
-!RUN: %f18 -E %s | FileCheck --ignore-case %s
+!RUN: %flang -E %s | FileCheck --ignore-case %s
integer, parameter :: flang_major = __flang_major__
diff --git a/flang/test/Preprocessing/defines.F90 b/flang/test/Preprocessing/defines.F90
index 449c54cbb01f..d59789f17f6d 100644
--- a/flang/test/Preprocessing/defines.F90
+++ b/flang/test/Preprocessing/defines.F90
@@ -1,4 +1,4 @@
-! RUN: %f18 -E -DFOO=1 -DBAR=2 %s | FileCheck %s
+! RUN: %flang -E -DFOO=1 -DBAR=2 %s | FileCheck %s
! CHECK: integer :: a = 1
integer :: a = FOO
diff --git a/flang/test/Preprocessing/fixed-rescan.F b/flang/test/Preprocessing/fixed-rescan.F
index 3d6ba9a8c6f4..ac983e7c3194 100644
--- a/flang/test/Preprocessing/fixed-rescan.F
+++ b/flang/test/Preprocessing/fixed-rescan.F
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s | FileCheck %s
+! RUN: %flang -E %s | FileCheck %s
! CHECK: callbar
! Ensure that rescanned lines after macro replacement are not
! misinterpreted as fixed-form comments when they start with C or D.
diff --git a/flang/test/Preprocessing/hollerith.f b/flang/test/Preprocessing/hollerith.f
index 0c920e0678e1..5f20259c57a8 100644
--- a/flang/test/Preprocessing/hollerith.f
+++ b/flang/test/Preprocessing/hollerith.f
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: character*1hi
! CHECK: dataa/1*1h /
! CHECK: datab/1*1h /
diff --git a/flang/test/Preprocessing/include-comment.F90 b/flang/test/Preprocessing/include-comment.F90
index 6ac475f76e46..239d9b7cc2e3 100644
--- a/flang/test/Preprocessing/include-comment.F90
+++ b/flang/test/Preprocessing/include-comment.F90
@@ -1,4 +1,4 @@
-! RUN: %f18 -I%S -E %s 2>&1 | FileCheck %s
+! RUN: %flang -I%S -E %s 2>&1 | FileCheck %s
! CHECK-NOT: :3:
#include <empty.h> ! comment
! CHECK-NOT: :5:
diff --git a/flang/test/Preprocessing/pp001.F b/flang/test/Preprocessing/pp001.F
index 95198641655a..455da7302763 100644
--- a/flang/test/Preprocessing/pp001.F
+++ b/flang/test/Preprocessing/pp001.F
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: if(777.eq.777)then
* keyword macros
integer, parameter :: KWM = 666
diff --git a/flang/test/Preprocessing/pp002.F b/flang/test/Preprocessing/pp002.F
index b4cbd7545adf..d673fcdbd6da 100644
--- a/flang/test/Preprocessing/pp002.F
+++ b/flang/test/Preprocessing/pp002.F
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: if(kwm.eq.777)then
* #undef
integer, parameter :: KWM = 777
diff --git a/flang/test/Preprocessing/pp003.F b/flang/test/Preprocessing/pp003.F
index 4df10c47d235..2062dbcee703 100644
--- a/flang/test/Preprocessing/pp003.F
+++ b/flang/test/Preprocessing/pp003.F
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: res=((666)+111)
* function-like macros
integer function IFLM(x)
diff --git a/flang/test/Preprocessing/pp004.F b/flang/test/Preprocessing/pp004.F
index 788d3682ab98..f5724df45d52 100644
--- a/flang/test/Preprocessing/pp004.F
+++ b/flang/test/Preprocessing/pp004.F
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: if(kwm.eq.777)then
* KWMs case-sensitive
integer, parameter :: KWM = 777
diff --git a/flang/test/Preprocessing/pp005.F b/flang/test/Preprocessing/pp005.F
index 390e662e3557..48cf12df628e 100644
--- a/flang/test/Preprocessing/pp005.F
+++ b/flang/test/Preprocessing/pp005.F
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: res=777
* KWM split across continuation, implicit padding
integer, parameter :: KWM = 666
diff --git a/flang/test/Preprocessing/pp006.F b/flang/test/Preprocessing/pp006.F
index 3c44728f56b5..f878bfddd143 100644
--- a/flang/test/Preprocessing/pp006.F
+++ b/flang/test/Preprocessing/pp006.F
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: res=777
* ditto, but with intervening *comment line
integer, parameter :: KWM = 666
diff --git a/flang/test/Preprocessing/pp007.F b/flang/test/Preprocessing/pp007.F
index ca78f4f4c6c5..a5d871a2d1c1 100644
--- a/flang/test/Preprocessing/pp007.F
+++ b/flang/test/Preprocessing/pp007.F
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: res=kwm
* KWM split across continuation, clipped after column 72
integer, parameter :: KWM = 666
diff --git a/flang/test/Preprocessing/pp008.F b/flang/test/Preprocessing/pp008.F
index 9dd7bd92ea50..7e580efddb65 100644
--- a/flang/test/Preprocessing/pp008.F
+++ b/flang/test/Preprocessing/pp008.F
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: res=kwm
* KWM with spaces in name at invocation NOT replaced
integer, parameter :: KWM = 777
diff --git a/flang/test/Preprocessing/pp009.F b/flang/test/Preprocessing/pp009.F
index c29021da484a..b6a6249c0544 100644
--- a/flang/test/Preprocessing/pp009.F
+++ b/flang/test/Preprocessing/pp009.F
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: res=((666)+111)
* FLM call split across continuation, implicit padding
integer function IFLM(x)
diff --git a/flang/test/Preprocessing/pp010.F b/flang/test/Preprocessing/pp010.F
index 4a812cde86af..e860bd9f3abe 100644
--- a/flang/test/Preprocessing/pp010.F
+++ b/flang/test/Preprocessing/pp010.F
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: res=((666)+111)
* ditto, but with intervening *comment line
integer function IFLM(x)
diff --git a/flang/test/Preprocessing/pp011.F b/flang/test/Preprocessing/pp011.F
index c106c8bc3f5c..af0e0e88b333 100644
--- a/flang/test/Preprocessing/pp011.F
+++ b/flang/test/Preprocessing/pp011.F
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: res=iflm(666)
* FLM call name split across continuation, clipped
integer function IFLM(x)
diff --git a/flang/test/Preprocessing/pp012.F b/flang/test/Preprocessing/pp012.F
index 411cfb887bb1..12ab61233275 100644
--- a/flang/test/Preprocessing/pp012.F
+++ b/flang/test/Preprocessing/pp012.F
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: res=((666)+111)
* FLM call name split across continuation
integer function IFLM(x)
diff --git a/flang/test/Preprocessing/pp013.F b/flang/test/Preprocessing/pp013.F
index f05e2e30fee6..07bb25e7c8d6 100644
--- a/flang/test/Preprocessing/pp013.F
+++ b/flang/test/Preprocessing/pp013.F
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: res=((666)+111)
* FLM call split between name and (
integer function IFLM(x)
diff --git a/flang/test/Preprocessing/pp014.F b/flang/test/Preprocessing/pp014.F
index 470966096e4e..7ac5d382bc7d 100644
--- a/flang/test/Preprocessing/pp014.F
+++ b/flang/test/Preprocessing/pp014.F
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: res=((666)+111)
* FLM call split between name and (, with intervening *comment
integer function IFLM(x)
diff --git a/flang/test/Preprocessing/pp015.F b/flang/test/Preprocessing/pp015.F
index 8320bd704fed..700da10a743e 100644
--- a/flang/test/Preprocessing/pp015.F
+++ b/flang/test/Preprocessing/pp015.F
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: res=((666)+111)
* FLM call split between name and (, clipped
integer function IFLM(x)
diff --git a/flang/test/Preprocessing/pp016.F b/flang/test/Preprocessing/pp016.F
index 95c89f8e1a03..c5d90e7e2ffb 100644
--- a/flang/test/Preprocessing/pp016.F
+++ b/flang/test/Preprocessing/pp016.F
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: res=((666)+111)
* FLM call split between name and ( and in argument
integer function IFLM(x)
diff --git a/flang/test/Preprocessing/pp017.F b/flang/test/Preprocessing/pp017.F
index a11f18514783..49fff58cdbb4 100644
--- a/flang/test/Preprocessing/pp017.F
+++ b/flang/test/Preprocessing/pp017.F
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: if(777.eq.777)then
* KLM rescan
integer, parameter :: KWM = 666, KWM2 = 667
diff --git a/flang/test/Preprocessing/pp018.F b/flang/test/Preprocessing/pp018.F
index 69c24e59f53d..d6a42160404c 100644
--- a/flang/test/Preprocessing/pp018.F
+++ b/flang/test/Preprocessing/pp018.F
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: if(kwm2.eq.777)then
* KLM rescan with #undef (so rescan is after expansion)
integer, parameter :: KWM2 = 777, KWM = 667
diff --git a/flang/test/Preprocessing/pp019.F b/flang/test/Preprocessing/pp019.F
index d607ad348407..a8c0ff6b598e 100644
--- a/flang/test/Preprocessing/pp019.F
+++ b/flang/test/Preprocessing/pp019.F
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: res=((666)+111)
* FLM rescan
integer function IFLM(x)
diff --git a/flang/test/Preprocessing/pp020.F b/flang/test/Preprocessing/pp020.F
index 88525003ba89..9fe9630a81c2 100644
--- a/flang/test/Preprocessing/pp020.F
+++ b/flang/test/Preprocessing/pp020.F
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: res=((111)+666)
* FLM expansion of argument
integer function IFLM(x)
diff --git a/flang/test/Preprocessing/pp021.F b/flang/test/Preprocessing/pp021.F
index 1662a680f5aa..2936264f6c9c 100644
--- a/flang/test/Preprocessing/pp021.F
+++ b/flang/test/Preprocessing/pp021.F
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: ch='KWM'
! CHECK: if(ch.eq.'KWM')then
* KWM NOT expanded in 'literal'
diff --git a/flang/test/Preprocessing/pp022.F b/flang/test/Preprocessing/pp022.F
index 026c02e9d4f0..647b683ec5bc 100644
--- a/flang/test/Preprocessing/pp022.F
+++ b/flang/test/Preprocessing/pp022.F
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: ch="KWM"
! CHECK: if(ch.eq.'KWM')then
* KWM NOT expanded in "literal"
diff --git a/flang/test/Preprocessing/pp023.F b/flang/test/Preprocessing/pp023.F
index a0d053f6addc..ecad31b57b6a 100644
--- a/flang/test/Preprocessing/pp023.F
+++ b/flang/test/Preprocessing/pp023.F
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: ch=3hKWM
! CHECK: if(ch.eq.'KWM')then
* KWM NOT expanded in 9HHOLLERITH literal
diff --git a/flang/test/Preprocessing/pp024.F b/flang/test/Preprocessing/pp024.F
index 6ea76cc9c24d..7f8e3bb99083 100644
--- a/flang/test/Preprocessing/pp024.F
+++ b/flang/test/Preprocessing/pp024.F
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: 100format(3hKWM)
! CHECK: if(ch.eq.'KWM')then
* KWM NOT expanded in Hollerith in FORMAT
diff --git a/flang/test/Preprocessing/pp025.F b/flang/test/Preprocessing/pp025.F
index 49521d443bd3..bb7bc212776b 100644
--- a/flang/test/Preprocessing/pp025.F
+++ b/flang/test/Preprocessing/pp025.F
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: res=ikwm2z
* KWM expansion is before token pasting due to fixed-form space removal
integer, parameter :: IKWM2Z = 777
diff --git a/flang/test/Preprocessing/pp026.F b/flang/test/Preprocessing/pp026.F
index b551f3b173ed..e37700129e9c 100644
--- a/flang/test/Preprocessing/pp026.F
+++ b/flang/test/Preprocessing/pp026.F
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: res=((111)+666)
* ## token pasting works in FLM
integer function IFLM(x)
diff --git a/flang/test/Preprocessing/pp027.F b/flang/test/Preprocessing/pp027.F
index c1b787f9366d..577bd48b0da3 100644
--- a/flang/test/Preprocessing/pp027.F
+++ b/flang/test/Preprocessing/pp027.F
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: kwm=666
! CHECK: if(777.eq.777)then
* #DEFINE works in fixed form
diff --git a/flang/test/Preprocessing/pp028.F b/flang/test/Preprocessing/pp028.F
index 51eab84f3687..3530628d5c50 100644
--- a/flang/test/Preprocessing/pp028.F
+++ b/flang/test/Preprocessing/pp028.F
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: res=kw
* fixed-form clipping done before KWM expansion on source line
integer, parameter :: KW = 777
diff --git a/flang/test/Preprocessing/pp029.F b/flang/test/Preprocessing/pp029.F
index 9be309f75143..23c0d337ad92 100644
--- a/flang/test/Preprocessing/pp029.F
+++ b/flang/test/Preprocessing/pp029.F
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: if(777.eq.777)then
* \ newline allowed in #define
integer, parameter :: KWM = 666
diff --git a/flang/test/Preprocessing/pp030.F b/flang/test/Preprocessing/pp030.F
index c04cf949f414..91b12178281d 100644
--- a/flang/test/Preprocessing/pp030.F
+++ b/flang/test/Preprocessing/pp030.F
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: if(777.eq.777)then
* /* C comment */ erased from #define
integer, parameter :: KWM = 666
diff --git a/flang/test/Preprocessing/pp031.F b/flang/test/Preprocessing/pp031.F
index 90b14647c4c9..d8286169c02f 100644
--- a/flang/test/Preprocessing/pp031.F
+++ b/flang/test/Preprocessing/pp031.F
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: if(777//ccomment.eq.777)then
! CHECK: print*,'pp031.F no: ',777//ccomment
* // C++ comment NOT erased from #define
diff --git a/flang/test/Preprocessing/pp032.F b/flang/test/Preprocessing/pp032.F
index 6b779141ecb5..22350e7349f6 100644
--- a/flang/test/Preprocessing/pp032.F
+++ b/flang/test/Preprocessing/pp032.F
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: if(777.eq.777)then
! CHECK: print*,'pp032.F no: ',777
* /* C comment */ \ newline erased from #define
diff --git a/flang/test/Preprocessing/pp033.F b/flang/test/Preprocessing/pp033.F
index 3364527cba6a..1b32ae6d90ca 100644
--- a/flang/test/Preprocessing/pp033.F
+++ b/flang/test/Preprocessing/pp033.F
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: if(777.eq.777)then
! CHECK: print*,'pp033.F no: ',777
* /* C comment \ newline */ erased from #define
diff --git a/flang/test/Preprocessing/pp034.F b/flang/test/Preprocessing/pp034.F
index 0c64aca62b1d..d9f8a72ec74a 100644
--- a/flang/test/Preprocessing/pp034.F
+++ b/flang/test/Preprocessing/pp034.F
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: if(777.eq.777)then
! CHECK: print*,'pp034.F no: ',777
* \ newline allowed in name on KWM definition
diff --git a/flang/test/Preprocessing/pp035.F b/flang/test/Preprocessing/pp035.F
index 808174129b89..0c0152a3df38 100644
--- a/flang/test/Preprocessing/pp035.F
+++ b/flang/test/Preprocessing/pp035.F
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: if(777.eq.777)then
! CHECK: print*,'pp035.F no: ',777
* #if 2 .LT. 3 works
diff --git a/flang/test/Preprocessing/pp036.F b/flang/test/Preprocessing/pp036.F
index b7024c41fa60..7894255dfb3b 100644
--- a/flang/test/Preprocessing/pp036.F
+++ b/flang/test/Preprocessing/pp036.F
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: if(.true.)then
! CHECK: print*,'pp036.F no: ',.true.
* #define FALSE TRUE ... .FALSE. -> .TRUE.
diff --git a/flang/test/Preprocessing/pp037.F b/flang/test/Preprocessing/pp037.F
index 52bfa8ffdab3..93c9b28e4d38 100644
--- a/flang/test/Preprocessing/pp037.F
+++ b/flang/test/Preprocessing/pp037.F
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: if(7777.eq.777)then
! CHECK: print*,'pp037.F no: ',7777
* fixed-form clipping NOT applied to #define
diff --git a/flang/test/Preprocessing/pp038.F b/flang/test/Preprocessing/pp038.F
index 7386aeebddee..655551b7a9c6 100644
--- a/flang/test/Preprocessing/pp038.F
+++ b/flang/test/Preprocessing/pp038.F
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: res=((666)+111)
* FLM call with closing ')' on next line (not a continuation)
integer function IFLM(x)
diff --git a/flang/test/Preprocessing/pp039.F b/flang/test/Preprocessing/pp039.F
index 9124474b86ba..f80e0b074007 100644
--- a/flang/test/Preprocessing/pp039.F
+++ b/flang/test/Preprocessing/pp039.F
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: res=iflm
! CHECK: (666)
! CHECK-NOT: res=((666)+111)
diff --git a/flang/test/Preprocessing/pp040.F b/flang/test/Preprocessing/pp040.F
index d589c38489cf..a3c2a6bd6b0a 100644
--- a/flang/test/Preprocessing/pp040.F
+++ b/flang/test/Preprocessing/pp040.F
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK-NOT: FAIL HARD!
* #define KWM c, then KWM works as comment line initiator
#define KWM c
diff --git a/flang/test/Preprocessing/pp041.F b/flang/test/Preprocessing/pp041.F
index dcf61536040b..9bc04db1e901 100644
--- a/flang/test/Preprocessing/pp041.F
+++ b/flang/test/Preprocessing/pp041.F
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: j=666wmj=j+1wm211
* use KWM expansion as continuation indicators
#define KWM 0
diff --git a/flang/test/Preprocessing/pp042.F b/flang/test/Preprocessing/pp042.F
index d5cc46a7a471..e5a679e226c8 100644
--- a/flang/test/Preprocessing/pp042.F
+++ b/flang/test/Preprocessing/pp042.F
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK-NOT: goto 2
* #define c 1, then use c as label in fixed-form
#define c 1
diff --git a/flang/test/Preprocessing/pp043.F b/flang/test/Preprocessing/pp043.F
index a079466e64f9..d8ed6b199bf1 100644
--- a/flang/test/Preprocessing/pp043.F
+++ b/flang/test/Preprocessing/pp043.F
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: if(kwm.eq.777)then
* #define with # in column 6 is a continuation line in fixed-form
integer, parameter :: defineKWM666 = 555
diff --git a/flang/test/Preprocessing/pp044.F b/flang/test/Preprocessing/pp044.F
index c14b29c3050c..a699c08a2e4f 100644
--- a/flang/test/Preprocessing/pp044.F
+++ b/flang/test/Preprocessing/pp044.F
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK-NOT:z=111
* #define directive amid continuations
integer, parameter :: KWM = 222, KWM111 = 333, KWM222 = 555
diff --git a/flang/test/Preprocessing/pp101.F90 b/flang/test/Preprocessing/pp101.F90
index b0f860157c82..dbf2aa9bc30d 100644
--- a/flang/test/Preprocessing/pp101.F90
+++ b/flang/test/Preprocessing/pp101.F90
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: if(777 .eq. 777) then
! keyword macros
integer, parameter :: KWM = 666
diff --git a/flang/test/Preprocessing/pp102.F90 b/flang/test/Preprocessing/pp102.F90
index e2c3207a4c24..73d931ad1511 100644
--- a/flang/test/Preprocessing/pp102.F90
+++ b/flang/test/Preprocessing/pp102.F90
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: if(kwm .eq. 777) then
! #undef
integer, parameter :: KWM = 777
diff --git a/flang/test/Preprocessing/pp103.F90 b/flang/test/Preprocessing/pp103.F90
index 3309d7f8205f..0384d8c193fa 100644
--- a/flang/test/Preprocessing/pp103.F90
+++ b/flang/test/Preprocessing/pp103.F90
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: res = ((666)+111)
! function-like macros
integer function IFLM(x)
diff --git a/flang/test/Preprocessing/pp104.F90 b/flang/test/Preprocessing/pp104.F90
index 51248c22154b..95653ff0f2aa 100644
--- a/flang/test/Preprocessing/pp104.F90
+++ b/flang/test/Preprocessing/pp104.F90
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: if(kwm .eq. 777) then
! KWMs case-sensitive
integer, parameter :: KWM = 777
diff --git a/flang/test/Preprocessing/pp105.F90 b/flang/test/Preprocessing/pp105.F90
index 898a4a168137..b4f73da6fa24 100644
--- a/flang/test/Preprocessing/pp105.F90
+++ b/flang/test/Preprocessing/pp105.F90
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: res = 777
! KWM call name split across continuation, with leading &
integer, parameter :: KWM = 666
diff --git a/flang/test/Preprocessing/pp106.F90 b/flang/test/Preprocessing/pp106.F90
index d83085fc1d71..556d779048f6 100644
--- a/flang/test/Preprocessing/pp106.F90
+++ b/flang/test/Preprocessing/pp106.F90
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: res = 777
! ditto, with & ! comment
integer, parameter :: KWM = 666
diff --git a/flang/test/Preprocessing/pp107.F90 b/flang/test/Preprocessing/pp107.F90
index 6973127a4cfa..51aa750b8d23 100644
--- a/flang/test/Preprocessing/pp107.F90
+++ b/flang/test/Preprocessing/pp107.F90
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: res = kwm
! KWM call name split across continuation, no leading &, with & ! comment
integer, parameter :: KWM = 666
diff --git a/flang/test/Preprocessing/pp108.F90 b/flang/test/Preprocessing/pp108.F90
index b07ec984fd81..d891bf3db5e2 100644
--- a/flang/test/Preprocessing/pp108.F90
+++ b/flang/test/Preprocessing/pp108.F90
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: res = kwm
! ditto, but without & ! comment
integer, parameter :: KWM = 666
diff --git a/flang/test/Preprocessing/pp109.F90 b/flang/test/Preprocessing/pp109.F90
index e75fd10c1cb8..b488049c4032 100644
--- a/flang/test/Preprocessing/pp109.F90
+++ b/flang/test/Preprocessing/pp109.F90
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: res = ((666)+111)
! FLM call name split with leading &
integer function IFLM(x)
diff --git a/flang/test/Preprocessing/pp110.F90 b/flang/test/Preprocessing/pp110.F90
index 681408ebfddf..3f6180c45b13 100644
--- a/flang/test/Preprocessing/pp110.F90
+++ b/flang/test/Preprocessing/pp110.F90
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: res = ((666)+111)
! ditto, with & ! comment
integer function IFLM(x)
diff --git a/flang/test/Preprocessing/pp111.F90 b/flang/test/Preprocessing/pp111.F90
index 4b49bf6ad6c9..b0b1219cfca5 100644
--- a/flang/test/Preprocessing/pp111.F90
+++ b/flang/test/Preprocessing/pp111.F90
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: res = iflm (666)
! FLM call name split across continuation, no leading &, with & ! comment
integer function IFLM(x)
diff --git a/flang/test/Preprocessing/pp112.F90 b/flang/test/Preprocessing/pp112.F90
index 9828366bef73..1a3cf3f53151 100644
--- a/flang/test/Preprocessing/pp112.F90
+++ b/flang/test/Preprocessing/pp112.F90
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: res = iflm (666)
! ditto, but without & ! comment
integer function IFLM(x)
diff --git a/flang/test/Preprocessing/pp113.F90 b/flang/test/Preprocessing/pp113.F90
index 56e34389068f..9604316cc238 100644
--- a/flang/test/Preprocessing/pp113.F90
+++ b/flang/test/Preprocessing/pp113.F90
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: res = ((666)+111)
! FLM call split across continuation between name and (, leading &
integer function IFLM(x)
diff --git a/flang/test/Preprocessing/pp114.F90 b/flang/test/Preprocessing/pp114.F90
index 4c44759ba96e..c44ca7d3924d 100644
--- a/flang/test/Preprocessing/pp114.F90
+++ b/flang/test/Preprocessing/pp114.F90
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: res = ((666)+111)
! ditto, with & ! comment, leading &
integer function IFLM(x)
diff --git a/flang/test/Preprocessing/pp115.F90 b/flang/test/Preprocessing/pp115.F90
index 290f62e68948..29b580241f38 100644
--- a/flang/test/Preprocessing/pp115.F90
+++ b/flang/test/Preprocessing/pp115.F90
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: res = iflm (666)
! ditto, with & ! comment, no leading &
integer function IFLM(x)
diff --git a/flang/test/Preprocessing/pp116.F90 b/flang/test/Preprocessing/pp116.F90
index d41fab771f84..9e070bac6bca 100644
--- a/flang/test/Preprocessing/pp116.F90
+++ b/flang/test/Preprocessing/pp116.F90
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: res = iflm (666)
! FLM call split between name and (, no leading &
integer function IFLM(x)
diff --git a/flang/test/Preprocessing/pp117.F90 b/flang/test/Preprocessing/pp117.F90
index c8d1c2ff3130..bb0692cd0b7b 100644
--- a/flang/test/Preprocessing/pp117.F90
+++ b/flang/test/Preprocessing/pp117.F90
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: if(777 .eq. 777) then
! KWM rescan
integer, parameter :: KWM = 666, KWM2 = 667
diff --git a/flang/test/Preprocessing/pp118.F90 b/flang/test/Preprocessing/pp118.F90
index e71cc410823b..fe24d83406b5 100644
--- a/flang/test/Preprocessing/pp118.F90
+++ b/flang/test/Preprocessing/pp118.F90
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: if(kwm2 .eq. 777) then
! KWM rescan with #undef, proving rescan after expansion
integer, parameter :: KWM2 = 777, KWM = 667
diff --git a/flang/test/Preprocessing/pp119.F90 b/flang/test/Preprocessing/pp119.F90
index ea9a15cb02de..514bff0c981f 100644
--- a/flang/test/Preprocessing/pp119.F90
+++ b/flang/test/Preprocessing/pp119.F90
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: res = ((666)+111)
! FLM rescan
integer function IFLM(x)
diff --git a/flang/test/Preprocessing/pp120.F90 b/flang/test/Preprocessing/pp120.F90
index 9c4b88c8d15c..510550b33496 100644
--- a/flang/test/Preprocessing/pp120.F90
+++ b/flang/test/Preprocessing/pp120.F90
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: res = ((111)+666)
! FLM expansion of argument
integer function IFLM(x)
diff --git a/flang/test/Preprocessing/pp121.F90 b/flang/test/Preprocessing/pp121.F90
index cdf25e15ee44..900e255d50c6 100644
--- a/flang/test/Preprocessing/pp121.F90
+++ b/flang/test/Preprocessing/pp121.F90
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: ch = 'KWM'
! CHECK: if(ch .eq. 'KWM') then
! KWM NOT expanded in 'literal'
diff --git a/flang/test/Preprocessing/pp122.F90 b/flang/test/Preprocessing/pp122.F90
index 14c8762af1c7..8051cbd4c67c 100644
--- a/flang/test/Preprocessing/pp122.F90
+++ b/flang/test/Preprocessing/pp122.F90
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: ch = "KWM"
! KWM NOT expanded in "literal"
#define KWM 666
diff --git a/flang/test/Preprocessing/pp123.F90 b/flang/test/Preprocessing/pp123.F90
index 1768cec1c23b..8181b683a569 100644
--- a/flang/test/Preprocessing/pp123.F90
+++ b/flang/test/Preprocessing/pp123.F90
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: ch = 3hKWM
! KWM NOT expanded in Hollerith literal
#define KWM 666
diff --git a/flang/test/Preprocessing/pp124.F90 b/flang/test/Preprocessing/pp124.F90
index bb011515ce1c..750f9facd279 100644
--- a/flang/test/Preprocessing/pp124.F90
+++ b/flang/test/Preprocessing/pp124.F90
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: 100 format(3hKWM)
! KWM NOT expanded in Hollerith in FORMAT
#define KWM 666
diff --git a/flang/test/Preprocessing/pp125.F90 b/flang/test/Preprocessing/pp125.F90
index cf3909b88824..86abccca7b4e 100644
--- a/flang/test/Preprocessing/pp125.F90
+++ b/flang/test/Preprocessing/pp125.F90
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: if(777 .eq. 777) then
! #DEFINE works in free form
integer, parameter :: KWM = 666
diff --git a/flang/test/Preprocessing/pp126.F90 b/flang/test/Preprocessing/pp126.F90
index fefb7fcf118f..f41af1e1b1cf 100644
--- a/flang/test/Preprocessing/pp126.F90
+++ b/flang/test/Preprocessing/pp126.F90
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: if(777 .eq. 777) then
! \ newline works in #define
integer, parameter :: KWM = 666
diff --git a/flang/test/Preprocessing/pp127.F90 b/flang/test/Preprocessing/pp127.F90
index 08feedf95305..09de8ede986b 100644
--- a/flang/test/Preprocessing/pp127.F90
+++ b/flang/test/Preprocessing/pp127.F90
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: res = iflm(666 )
! FLM call with closing ')' on next line (not a continuation)
integer function IFLM(x)
diff --git a/flang/test/Preprocessing/pp128.F90 b/flang/test/Preprocessing/pp128.F90
index 46918e05f5c3..a8bc79227aaa 100644
--- a/flang/test/Preprocessing/pp128.F90
+++ b/flang/test/Preprocessing/pp128.F90
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: res = iflm
! FLM call with '(' on next line (not a continuation)
integer function IFLM(x)
diff --git a/flang/test/Preprocessing/pp129.F90 b/flang/test/Preprocessing/pp129.F90
index ab7e7f0baa8b..dee4c7b6d144 100644
--- a/flang/test/Preprocessing/pp129.F90
+++ b/flang/test/Preprocessing/pp129.F90
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK-NOT: stop
! #define KWM !, then KWM works as comment line initiator
#define KWM !
diff --git a/flang/test/Preprocessing/pp130.F90 b/flang/test/Preprocessing/pp130.F90
index be1148807b8b..8066e28280e1 100644
--- a/flang/test/Preprocessing/pp130.F90
+++ b/flang/test/Preprocessing/pp130.F90
@@ -1,4 +1,4 @@
-! RUN: (%f18 -E %s 2>&1 || true) | FileCheck %s
+! RUN: (%flang -E %s 2>&1 || true) | FileCheck %s
! CHECK: error: bad character ('&') in Fortran token
! #define KWM &, use for continuation w/o pasting (ifort and nag seem to continue #define)
#define KWM &
diff --git a/flang/test/lit.cfg.py b/flang/test/lit.cfg.py
index c9992b75c218..d724628dc0bb 100644
--- a/flang/test/lit.cfg.py
+++ b/flang/test/lit.cfg.py
@@ -73,6 +73,11 @@
if config.include_flang_new_driver_test:
tools.append(ToolSubst('%flang-new', command=FindTool('flang-new'), unresolved='fatal'))
+ tools.append(ToolSubst('%flang', command=FindTool('flang-new'), unresolved='fatal'))
+else:
+ tools.append(ToolSubst('%flang', command=FindTool('f18'),
+ extra_args=["-intrinsic-module-directory "+config.flang_intrinsic_modules_dir],
+ unresolved='fatal'))
if config.flang_standalone_build:
llvm_config.add_tool_substitutions(tools, [config.flang_llvm_tools_dir])
More information about the llvm-branch-commits
mailing list