[flang] Update the regression tests to use the new driver when enabled
This patch updates most of the remaining regression tests (~400) to use
`flang-new` rather then `f18` when `FLANG_BUILD_NEW_DRIVER` is set.
This allows us to share more Flang regression tests between `f18` and
`flang-new`. A handful of tests have not been ported yet - these are
currently either failing or not supported by the new driver.
Summary of changes:
* RUN lines in tests are updated to use `%flang_fc1` instead of `%f18`
* option spellings in tests are updated to forms accepted by both `f18` and
`flang-new`
* variables in Bash scripts are renamed (e.g. F18 --> FLANG_FC1)
The updated tests will now be run with the new driver, `flang-new`,
whenever it is enabled (i.e when `FLANG_BUILD_NEW_DRIVER` is set).
Although this patch touches many files, vast majority of the changes are
automatic:
```
grep -IEZlr "%f18" flang/test/ | xargs -0 -l sed -i 's/%f18/%flang_fc1/g
```
Differential Revision: https://reviews.llvm.org/D100309
GitOrigin-RevId: e7be90bd27051c3dcd9a344cb1b347a0c9454c21
diff --git a/test/Evaluate/folding01.f90 b/test/Evaluate/folding01.f90
index b12c6a0..2cd855c 100644
--- a/test/Evaluate/folding01.f90
+++ b/test/Evaluate/folding01.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_folding.sh %s %t %f18
+! RUN: %S/test_folding.sh %s %t %flang_fc1
! Test intrinsic operation folding
diff --git a/test/Evaluate/folding02.f90 b/test/Evaluate/folding02.f90
index b39490a..57a1978 100644
--- a/test/Evaluate/folding02.f90
+++ b/test/Evaluate/folding02.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_folding.sh %s %t %f18
+! RUN: %S/test_folding.sh %s %t %flang_fc1
! Check intrinsic function folding with host runtime library
module m
diff --git a/test/Evaluate/folding03.f90 b/test/Evaluate/folding03.f90
index 22377d0..0eaedb2 100644
--- a/test/Evaluate/folding03.f90
+++ b/test/Evaluate/folding03.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_folding.sh %s %t %f18
+! RUN: %S/test_folding.sh %s %t %flang_fc1
! Test operation folding edge case (both expected value and messages)
! These tests make assumptions regarding real(4) and integer(4) extrema.
diff --git a/test/Evaluate/folding04.f90 b/test/Evaluate/folding04.f90
index 187822e..626825d 100644
--- a/test/Evaluate/folding04.f90
+++ b/test/Evaluate/folding04.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_folding.sh %s %t %f18
+! RUN: %S/test_folding.sh %s %t %flang_fc1
! Test intrinsic function folding edge case (both expected value and messages)
! These tests make assumptions regarding real(4) extrema.
diff --git a/test/Evaluate/folding06.f90 b/test/Evaluate/folding06.f90
index d3cbf1b..5fc0066 100644
--- a/test/Evaluate/folding06.f90
+++ b/test/Evaluate/folding06.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_folding.sh %s %t %f18
+! RUN: %S/test_folding.sh %s %t %flang_fc1
! Test transformational intrinsic function folding
module m
diff --git a/test/Evaluate/folding07.f90 b/test/Evaluate/folding07.f90
index b99d989..d579c19 100644
--- a/test/Evaluate/folding07.f90
+++ b/test/Evaluate/folding07.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_folding.sh %s %t %f18
+! RUN: %S/test_folding.sh %s %t %flang_fc1
! Test numeric model inquiry intrinsics
module m
diff --git a/test/Evaluate/folding08.f90 b/test/Evaluate/folding08.f90
index f7c8c12..ae9bdf5 100644
--- a/test/Evaluate/folding08.f90
+++ b/test/Evaluate/folding08.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_folding.sh %s %t %f18
+! RUN: %S/test_folding.sh %s %t %flang_fc1
! Test folding of LBOUND and UBOUND
module m
diff --git a/test/Evaluate/folding09.f90 b/test/Evaluate/folding09.f90
index ed60f08..9819bbd 100644
--- a/test/Evaluate/folding09.f90
+++ b/test/Evaluate/folding09.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_folding.sh %s %t %f18
+! RUN: %S/test_folding.sh %s %t %flang_fc1
! Test folding of IS_CONTIGUOUS on simply contiguous items (9.5.4)
! When IS_CONTIGUOUS() is constant, it's .TRUE.
diff --git a/test/Evaluate/folding10.f90 b/test/Evaluate/folding10.f90
index 077d8d9..fbc357d 100644
--- a/test/Evaluate/folding10.f90
+++ b/test/Evaluate/folding10.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_folding.sh %s %t %f18
+! RUN: %S/test_folding.sh %s %t %flang_fc1
! Tests folding of SHAPE(TRANSFER(...))
module m
diff --git a/test/Evaluate/folding11.f90 b/test/Evaluate/folding11.f90
index 8998388..d5003ca 100644
--- a/test/Evaluate/folding11.f90
+++ b/test/Evaluate/folding11.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_folding.sh %s %t %f18
+! RUN: %S/test_folding.sh %s %t %flang_fc1
module m
complex, parameter :: z1 = 1. + (2., 3.)
logical, parameter :: test_z1 = z1 == (3., 3.)
diff --git a/test/Evaluate/folding12.f90 b/test/Evaluate/folding12.f90
index 657ddc6..94ecb2d 100644
--- a/test/Evaluate/folding12.f90
+++ b/test/Evaluate/folding12.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_folding.sh %s %t %f18
+! RUN: %S/test_folding.sh %s %t %flang_fc1
! Test folding of structure constructors
module m1
type parent_type
diff --git a/test/Evaluate/folding13.f90 b/test/Evaluate/folding13.f90
index 753b7be..fbc37ad 100644
--- a/test/Evaluate/folding13.f90
+++ b/test/Evaluate/folding13.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_folding.sh %s %t %f18
+! RUN: %S/test_folding.sh %s %t %flang_fc1
! Test folding of array constructors with constant implied DO bounds;
! their indices are constant expressions and can be used as such.
module m1
diff --git a/test/Evaluate/folding14.f90 b/test/Evaluate/folding14.f90
index 106b8ed..ff1f3ab 100644
--- a/test/Evaluate/folding14.f90
+++ b/test/Evaluate/folding14.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_folding.sh %s %t %f18
+! RUN: %S/test_folding.sh %s %t %flang_fc1
! Test folding of isnan() extension
module m1
logical, parameter :: results(*) = isnan([ &
diff --git a/test/Evaluate/folding15.f90 b/test/Evaluate/folding15.f90
index 7c0df86..d689466 100644
--- a/test/Evaluate/folding15.f90
+++ b/test/Evaluate/folding15.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_folding.sh %s %t %f18
+! RUN: %S/test_folding.sh %s %t %flang_fc1
! Test folding of array constructors with duplicate names for the implied
! DO variables
module m1
diff --git a/test/Evaluate/folding16.f90 b/test/Evaluate/folding16.f90
index ac4550a..bb3aee0 100644
--- a/test/Evaluate/folding16.f90
+++ b/test/Evaluate/folding16.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_folding.sh %s %t %f18
+! RUN: %S/test_folding.sh %s %t %flang_fc1
! Ensure that lower bounds are accounted for in intrinsic folding;
! this is a regression test for a bug in which they were not
module m
diff --git a/test/Evaluate/folding17.f90 b/test/Evaluate/folding17.f90
index cbfddaa..2880822 100644
--- a/test/Evaluate/folding17.f90
+++ b/test/Evaluate/folding17.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_folding.sh %s %t %f18
+! RUN: %S/test_folding.sh %s %t %flang_fc1
! Test implementations of STORAGE_SIZE() and SIZEOF() as expression rewrites
module m1
type :: t1
diff --git a/test/Evaluate/folding18.f90 b/test/Evaluate/folding18.f90
index 613e57a..c9cc918 100644
--- a/test/Evaluate/folding18.f90
+++ b/test/Evaluate/folding18.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_folding.sh %s %t %f18
+! RUN: %S/test_folding.sh %s %t %flang_fc1
! Test implementations of IEEE inquiry functions
module m
use ieee_arithmetic
diff --git a/test/Evaluate/folding19.f90 b/test/Evaluate/folding19.f90
index a8052df..e2e3e56 100644
--- a/test/Evaluate/folding19.f90
+++ b/test/Evaluate/folding19.f90
@@ -1,4 +1,4 @@
-! RUN: not %f18 %s 2>&1 | FileCheck %s
+! RUN: not %flang_fc1 %s 2>&1 | FileCheck %s
! Check errors found in folding
! TODO: test others emitted from flang/lib/Evaluate
module m
diff --git a/test/Lower/pre-fir-tree04.f90 b/test/Lower/pre-fir-tree04.f90
index 06fc88f..55b0cb1 100644
--- a/test/Lower/pre-fir-tree04.f90
+++ b/test/Lower/pre-fir-tree04.f90
@@ -1,4 +1,4 @@
-! RUN: %f18 -fsyntax-only -fdebug-pre-fir-tree %s | FileCheck %s
+! RUN: %flang_fc1 -fsyntax-only -fdebug-pre-fir-tree %s | FileCheck %s
! Test Pre-FIR Tree captures all the coarray related statements
diff --git a/test/Parser/acc-unparse.f90 b/test/Parser/acc-unparse.f90
index cb0edee..d4d4829 100644
--- a/test/Parser/acc-unparse.f90
+++ b/test/Parser/acc-unparse.f90
@@ -1,4 +1,4 @@
-! RUN: %f18 -fopenacc -funparse %s | FileCheck %s
+! RUN: %flang_fc1 -fopenacc -fdebug-unparse %s | FileCheck %s
! Test unparse does not crash with OpenACC directives.
diff --git a/test/Parser/badlabel.f b/test/Parser/badlabel.f
index 28008bd..819dcf8 100644
--- a/test/Parser/badlabel.f
+++ b/test/Parser/badlabel.f
@@ -1,4 +1,4 @@
-! RUN: %f18 -E %s 2>&1 | FileCheck %s
+! RUN: %flang_fc1 -E %s 2>&1 | FileCheck %s
! CHECK: Label digit is not in fixed-form label field
1 continue
! CHECK: Label digit is not in fixed-form label field
diff --git a/test/Parser/compiler-directives.f90 b/test/Parser/compiler-directives.f90
index f29d6fe..9525033 100644
--- a/test/Parser/compiler-directives.f90
+++ b/test/Parser/compiler-directives.f90
@@ -1,4 +1,4 @@
-! RUN: %f18 -funparse %s 2>&1
+! RUN: %flang_fc1 -fdebug-unparse %s 2>&1
! Test that compiler directives can appear in various places.
diff --git a/test/Semantics/OpenACC/acc-symbols01.f90 b/test/Semantics/OpenACC/acc-symbols01.f90
index 1fe26d6..bab0aac 100644
--- a/test/Semantics/OpenACC/acc-symbols01.f90
+++ b/test/Semantics/OpenACC/acc-symbols01.f90
@@ -1,4 +1,4 @@
-! RUN: %S/../test_symbols.sh %s %t %f18 -fopenacc
+! RUN: %S/../test_symbols.sh %s %t %flang_fc1 -fopenacc
!DEF: /mm MainProgram
program mm
diff --git a/test/Semantics/allocate01.f90 b/test/Semantics/allocate01.f90
index 81d77e5..4a6c2d0 100644
--- a/test/Semantics/allocate01.f90
+++ b/test/Semantics/allocate01.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Check for semantic errors in ALLOCATE statements
! Creating a symbol that allocate should accept
diff --git a/test/Semantics/allocate02.f90 b/test/Semantics/allocate02.f90
index b16391b..c396de0 100644
--- a/test/Semantics/allocate02.f90
+++ b/test/Semantics/allocate02.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Check for semantic errors in ALLOCATE statements
diff --git a/test/Semantics/allocate03.f90 b/test/Semantics/allocate03.f90
index fa0febc..ba9845f 100644
--- a/test/Semantics/allocate03.f90
+++ b/test/Semantics/allocate03.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Check for semantic errors in ALLOCATE statements
subroutine C933_a(b1, ca3, ca4, cp3, cp3mold, cp4, cp7, cp8, bsrc)
diff --git a/test/Semantics/allocate04.f90 b/test/Semantics/allocate04.f90
index b74b187..8928cc7 100644
--- a/test/Semantics/allocate04.f90
+++ b/test/Semantics/allocate04.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Check for semantic errors in ALLOCATE statements
diff --git a/test/Semantics/allocate05.f90 b/test/Semantics/allocate05.f90
index da7fdca..52fd4a3 100644
--- a/test/Semantics/allocate05.f90
+++ b/test/Semantics/allocate05.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Check for semantic errors in ALLOCATE statements
diff --git a/test/Semantics/allocate06.f90 b/test/Semantics/allocate06.f90
index 0b204f9..6a7cf79 100644
--- a/test/Semantics/allocate06.f90
+++ b/test/Semantics/allocate06.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Check for semantic errors in ALLOCATE statements
diff --git a/test/Semantics/allocate07.f90 b/test/Semantics/allocate07.f90
index 0a0c5f2..7063612 100644
--- a/test/Semantics/allocate07.f90
+++ b/test/Semantics/allocate07.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Check for semantic errors in ALLOCATE statements
subroutine C936(param_ca_4_assumed, param_ta_4_assumed, param_ca_4_deferred)
diff --git a/test/Semantics/allocate08.f90 b/test/Semantics/allocate08.f90
index c6dce0d..25dc453 100644
--- a/test/Semantics/allocate08.f90
+++ b/test/Semantics/allocate08.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Check for semantic errors in ALLOCATE statements
subroutine C945_a(srca, srcb, srcc, src_complex, src_logical, &
diff --git a/test/Semantics/allocate09.f90 b/test/Semantics/allocate09.f90
index 3a0feab..d351e72 100644
--- a/test/Semantics/allocate09.f90
+++ b/test/Semantics/allocate09.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Check for semantic errors in ALLOCATE statements
subroutine C946(param_ca_4_assumed, param_ta_4_assumed, param_ca_4_deferred)
diff --git a/test/Semantics/allocate10.f90 b/test/Semantics/allocate10.f90
index 142e9d0..bb62767 100644
--- a/test/Semantics/allocate10.f90
+++ b/test/Semantics/allocate10.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Check for semantic errors in ALLOCATE statements
!TODO: mixing expr and source-expr?
diff --git a/test/Semantics/allocate11.f90 b/test/Semantics/allocate11.f90
index ca5ed95..3807186 100644
--- a/test/Semantics/allocate11.f90
+++ b/test/Semantics/allocate11.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Check for semantic errors in ALLOCATE statements
! TODO: Function Pointer in allocate and derived types!
diff --git a/test/Semantics/allocate12.f90 b/test/Semantics/allocate12.f90
index 91cb979..075fa6a 100644
--- a/test/Semantics/allocate12.f90
+++ b/test/Semantics/allocate12.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Check for semantic errors in ALLOCATE statements
subroutine C941_C942b_C950(xsrc, x1, a2, b2, cx1, ca2, cb1, cb2, c1, c2)
diff --git a/test/Semantics/allocate13.f90 b/test/Semantics/allocate13.f90
index e5567bd..8fa2b95 100644
--- a/test/Semantics/allocate13.f90
+++ b/test/Semantics/allocate13.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Check for semantic errors in ALLOCATE statements
module not_iso_fortran_env
diff --git a/test/Semantics/altreturn01.f90 b/test/Semantics/altreturn01.f90
index b6a6e4e..8541287 100644
--- a/test/Semantics/altreturn01.f90
+++ b/test/Semantics/altreturn01.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Check calls with alt returns
CALL TEST (N, *100, *200 )
diff --git a/test/Semantics/altreturn02.f90 b/test/Semantics/altreturn02.f90
index 45fc049..f3fd9e4 100644
--- a/test/Semantics/altreturn02.f90
+++ b/test/Semantics/altreturn02.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Check subroutine with alt return
SUBROUTINE TEST (N, *, *)
diff --git a/test/Semantics/altreturn03.f90 b/test/Semantics/altreturn03.f90
index cd46c4c..2f6c7f2 100644
--- a/test/Semantics/altreturn03.f90
+++ b/test/Semantics/altreturn03.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Check for various alt return error conditions
SUBROUTINE TEST (N, *, *)
diff --git a/test/Semantics/altreturn04.f90 b/test/Semantics/altreturn04.f90
index 6356c46..4d2e695 100644
--- a/test/Semantics/altreturn04.f90
+++ b/test/Semantics/altreturn04.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Functions cannot use alt return
REAL FUNCTION altreturn01(X)
diff --git a/test/Semantics/altreturn05.f90 b/test/Semantics/altreturn05.f90
index 28530d9..aa9fb36 100644
--- a/test/Semantics/altreturn05.f90
+++ b/test/Semantics/altreturn05.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Test extension: RETURN from main program
return !ok
diff --git a/test/Semantics/altreturn06.f90 b/test/Semantics/altreturn06.f90
index 27a7b9a0..15a33b3 100644
--- a/test/Semantics/altreturn06.f90
+++ b/test/Semantics/altreturn06.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Test alternat return argument passing for internal and external subprograms
! Both of the following are OK
call extSubprogram (*100)
diff --git a/test/Semantics/array-constr-values.f90 b/test/Semantics/array-constr-values.f90
index ddab8a6..8b7883d 100644
--- a/test/Semantics/array-constr-values.f90
+++ b/test/Semantics/array-constr-values.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Confirm enforcement of constraints and restrictions in 7.8
! C7110, C7111, C7112, C7113, C7114, C7115
diff --git a/test/Semantics/assign01.f90 b/test/Semantics/assign01.f90
index 7d02e10..0c34c4e 100644
--- a/test/Semantics/assign01.f90
+++ b/test/Semantics/assign01.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! 10.2.3.1(2) All masks and LHS of assignments in a WHERE must conform
subroutine s1
diff --git a/test/Semantics/assign02.f90 b/test/Semantics/assign02.f90
index 292a6d4..16e5775 100644
--- a/test/Semantics/assign02.f90
+++ b/test/Semantics/assign02.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Pointer assignment constraints 10.2.2.2
module m1
diff --git a/test/Semantics/assign03.f90 b/test/Semantics/assign03.f90
index c53bb0e..2c60475 100644
--- a/test/Semantics/assign03.f90
+++ b/test/Semantics/assign03.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Pointer assignment constraints 10.2.2.2 (see also assign02.f90)
module m
diff --git a/test/Semantics/assign04.f90 b/test/Semantics/assign04.f90
index 7cb30c4..8887b4d 100644
--- a/test/Semantics/assign04.f90
+++ b/test/Semantics/assign04.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! 9.4.5
subroutine s1
type :: t(k, l)
diff --git a/test/Semantics/assign06.f90 b/test/Semantics/assign06.f90
index a2e7a59..12ac4e6 100644
--- a/test/Semantics/assign06.f90
+++ b/test/Semantics/assign06.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Test ASSIGN statement, assigned GOTO, and assigned format labels
! (see subclause 8.2.4 in Fortran 90 (*not* 2018!)
diff --git a/test/Semantics/assign07.f90 b/test/Semantics/assign07.f90
index 8ea1024..7ffcc4f 100644
--- a/test/Semantics/assign07.f90
+++ b/test/Semantics/assign07.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Test ASSIGN statement, assigned GOTO, and assigned format labels
! (see subclause 8.2.4 in Fortran 90 (*not* 2018!)
diff --git a/test/Semantics/associated.f90 b/test/Semantics/associated.f90
index 641b7d9..e23cda5 100644
--- a/test/Semantics/associated.f90
+++ b/test/Semantics/associated.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Tests for the ASSOCIATED() and NULL() intrinsics
subroutine assoc()
diff --git a/test/Semantics/bad-forward-type.f90 b/test/Semantics/bad-forward-type.f90
index b7857e1..6c7d082 100644
--- a/test/Semantics/bad-forward-type.f90
+++ b/test/Semantics/bad-forward-type.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Forward references to derived types (error cases)
! C732 A parent-type-name shall be the name of a previously defined
! extensible type (7.5.7).
diff --git a/test/Semantics/badly-typed-intrinsic.f90 b/test/Semantics/badly-typed-intrinsic.f90
index 8f57037..532ef37 100644
--- a/test/Semantics/badly-typed-intrinsic.f90
+++ b/test/Semantics/badly-typed-intrinsic.f90
@@ -1,4 +1,4 @@
-! RUN: %f18 -fsyntax-only %s 2>&1 | FileCheck %s
+! RUN: %flang_fc1 -fsyntax-only %s 2>&1 | FileCheck %s
type :: t
end type
diff --git a/test/Semantics/bind-c01.f90 b/test/Semantics/bind-c01.f90
index 9afb049..f5a0e67 100644
--- a/test/Semantics/bind-c01.f90
+++ b/test/Semantics/bind-c01.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Check for multiple symbols being defined with with same BIND(C) name
module m1
diff --git a/test/Semantics/bindings01.f90 b/test/Semantics/bindings01.f90
index b838047..c4421b1 100644
--- a/test/Semantics/bindings01.f90
+++ b/test/Semantics/bindings01.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Confirm enforcement of constraints and restrictions in 7.5.7.3
! and C733, C734 and C779, C780, C782, C783, C784, and C785.
diff --git a/test/Semantics/block-data01.f90 b/test/Semantics/block-data01.f90
index 6549e40..715d670 100644
--- a/test/Semantics/block-data01.f90
+++ b/test/Semantics/block-data01.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Test BLOCK DATA subprogram (14.3)
block data foo
!ERROR: IMPORT is not allowed in a BLOCK DATA subprogram
diff --git a/test/Semantics/blockconstruct01.f90 b/test/Semantics/blockconstruct01.f90
index 2b159f4..cd07a41 100644
--- a/test/Semantics/blockconstruct01.f90
+++ b/test/Semantics/blockconstruct01.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! C1107 -- COMMON, EQUIVALENCE, INTENT, NAMELIST, OPTIONAL, VALUE or
! STATEMENT FUNCTIONS not allow in specification part
diff --git a/test/Semantics/blockconstruct02.f90 b/test/Semantics/blockconstruct02.f90
index cc7aeee..62f5557 100644
--- a/test/Semantics/blockconstruct02.f90
+++ b/test/Semantics/blockconstruct02.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! C1108 -- Save statement in a BLOCK construct shall not conatin a
! saved-entity-list that does not specify a common-block-name
diff --git a/test/Semantics/blockconstruct03.f90 b/test/Semantics/blockconstruct03.f90
index a920d91..14077f5 100644
--- a/test/Semantics/blockconstruct03.f90
+++ b/test/Semantics/blockconstruct03.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Tests implemented for this standard:
! Block Construct
! C1109
diff --git a/test/Semantics/boz-literal-constants.f90 b/test/Semantics/boz-literal-constants.f90
index 23155cc..766466a 100644
--- a/test/Semantics/boz-literal-constants.f90
+++ b/test/Semantics/boz-literal-constants.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Confirm enforcement of constraints and restrictions in 7.7
! C7107, C7108, C7109
diff --git a/test/Semantics/c_f_pointer.f90 b/test/Semantics/c_f_pointer.f90
index 1243c5b..adf427e 100644
--- a/test/Semantics/c_f_pointer.f90
+++ b/test/Semantics/c_f_pointer.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Enforce 18.2.3.3
program test
diff --git a/test/Semantics/call01.f90 b/test/Semantics/call01.f90
index f7289b0..02edfc4 100644
--- a/test/Semantics/call01.f90
+++ b/test/Semantics/call01.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Confirm enforcement of constraints and restrictions in 15.6.2.1
non_recursive function f01(n) result(res)
diff --git a/test/Semantics/call02.f90 b/test/Semantics/call02.f90
index 1b0701a..96538d6 100644
--- a/test/Semantics/call02.f90
+++ b/test/Semantics/call02.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! 15.5.1 procedure reference constraints and restrictions
subroutine s01(elem, subr)
diff --git a/test/Semantics/call03.f90 b/test/Semantics/call03.f90
index 53005f9..f76e421 100644
--- a/test/Semantics/call03.f90
+++ b/test/Semantics/call03.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Test 15.5.2.4 constraints and restrictions for non-POINTER non-ALLOCATABLE
! dummy arguments.
diff --git a/test/Semantics/call04.f90 b/test/Semantics/call04.f90
index f437f80..95eb0bc 100644
--- a/test/Semantics/call04.f90
+++ b/test/Semantics/call04.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Test 8.5.10 & 8.5.18 constraints on dummy argument declarations
module m
diff --git a/test/Semantics/call05.f90 b/test/Semantics/call05.f90
index 86da81d..90368df 100644
--- a/test/Semantics/call05.f90
+++ b/test/Semantics/call05.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Test 15.5.2.5 constraints and restrictions for POINTER & ALLOCATABLE
! arguments when both sides of the call have the same attributes.
diff --git a/test/Semantics/call06.f90 b/test/Semantics/call06.f90
index 1d37295..fc31903 100644
--- a/test/Semantics/call06.f90
+++ b/test/Semantics/call06.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Test 15.5.2.6 constraints and restrictions for ALLOCATABLE
! dummy arguments.
diff --git a/test/Semantics/call07.f90 b/test/Semantics/call07.f90
index db531ed..996337f 100644
--- a/test/Semantics/call07.f90
+++ b/test/Semantics/call07.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Test 15.5.2.7 constraints and restrictions for POINTER dummy arguments.
module m
diff --git a/test/Semantics/call08.f90 b/test/Semantics/call08.f90
index d2d2ca8..17396d4 100644
--- a/test/Semantics/call08.f90
+++ b/test/Semantics/call08.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Test 15.5.2.8 coarray dummy arguments
module m
diff --git a/test/Semantics/call09.f90 b/test/Semantics/call09.f90
index 6f55470..8280a82 100644
--- a/test/Semantics/call09.f90
+++ b/test/Semantics/call09.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Test 15.5.2.9(2,3,5) dummy procedure requirements
! C843
! An entity with the INTENT attribute shall be a dummy data object or a
diff --git a/test/Semantics/call10.f90 b/test/Semantics/call10.f90
index 803726c..5eb5f5a 100644
--- a/test/Semantics/call10.f90
+++ b/test/Semantics/call10.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Test 15.7 (C1583-C1590, C1592-C1599) constraints and restrictions
! for pure procedures.
! (C1591 is tested in call11.f90; C1594 in call12.f90.)
diff --git a/test/Semantics/call11.f90 b/test/Semantics/call11.f90
index 7919eec..55aefa6 100644
--- a/test/Semantics/call11.f90
+++ b/test/Semantics/call11.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Test 15.7 C1591 & others: contexts requiring pure subprograms
module m
diff --git a/test/Semantics/call12.f90 b/test/Semantics/call12.f90
index 09ae03b..813cc52 100644
--- a/test/Semantics/call12.f90
+++ b/test/Semantics/call12.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Test 15.7 C1594 - prohibited assignments in pure subprograms
module used
diff --git a/test/Semantics/call13.f90 b/test/Semantics/call13.f90
index da8ae6c..bb589b5 100644
--- a/test/Semantics/call13.f90
+++ b/test/Semantics/call13.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Test 15.4.2.2 constraints and restrictions for calls to implicit
! interfaces
diff --git a/test/Semantics/call14.f90 b/test/Semantics/call14.f90
index 5007a0a..b900204 100644
--- a/test/Semantics/call14.f90
+++ b/test/Semantics/call14.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Test 8.5.18 constraints on the VALUE attribute
module m
diff --git a/test/Semantics/call15.f90 b/test/Semantics/call15.f90
index 458b374..9879f73 100644
--- a/test/Semantics/call15.f90
+++ b/test/Semantics/call15.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! C711 An assumed-type actual argument that corresponds to an assumed-rank
! dummy argument shall be assumed-shape or assumed-rank.
subroutine s(arg1, arg2, arg3)
diff --git a/test/Semantics/call16.f90 b/test/Semantics/call16.f90
index c1ace8c..944e04c 100644
--- a/test/Semantics/call16.f90
+++ b/test/Semantics/call16.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Test that intrinsic functions used as subroutines and vice versa are caught.
diff --git a/test/Semantics/call17.f90 b/test/Semantics/call17.f90
index d392756..299abaf 100644
--- a/test/Semantics/call17.f90
+++ b/test/Semantics/call17.f90
@@ -1,4 +1,4 @@
-! RUN: %f18 -fsyntax-only %s 2>&1 | FileCheck %s --allow-empty
+! RUN: %flang_fc1 -fsyntax-only %s 2>&1 | FileCheck %s --allow-empty
! Regression test: don't emit a bogus error about an invalid specification expression
! in the declaration of a binding
diff --git a/test/Semantics/call18.f90 b/test/Semantics/call18.f90
index 95c850d..9bf7dc6 100644
--- a/test/Semantics/call18.f90
+++ b/test/Semantics/call18.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Ensure that references to functions that return pointers can serve as
! "variables" in actual arguments. All of these uses are conforming and
! no errors should be reported.
diff --git a/test/Semantics/canondo05.f90 b/test/Semantics/canondo05.f90
index 0de34f1..cdac323 100644
--- a/test/Semantics/canondo05.f90
+++ b/test/Semantics/canondo05.f90
@@ -1,5 +1,5 @@
! RUN: %flang_fc1 -fdebug-unparse-with-symbols %s 2>&1 | FileCheck %s
-! RUN: %f18 -fopenmp -funparse-with-symbols %s 2>&1 | FileCheck %s
+! RUN: %flang_fc1 -fopenmp -fdebug-unparse-with-symbols %s 2>&1 | FileCheck %s
! CHECK-NOT: do *[1-9]
program P
diff --git a/test/Semantics/canondo06.f90 b/test/Semantics/canondo06.f90
index dae6b38..3dab59d 100644
--- a/test/Semantics/canondo06.f90
+++ b/test/Semantics/canondo06.f90
@@ -1,4 +1,4 @@
-! RUN: %f18 -fopenmp -funparse-with-symbols %s 2>&1 | FileCheck %s
+! RUN: %flang_fc1 -fopenmp -fdebug-unparse-with-symbols %s 2>&1 | FileCheck %s
! CHECK-NOT: do *[1-9]
! CHECK: omp simd
diff --git a/test/Semantics/case01.f90 b/test/Semantics/case01.f90
index 6342233..05e27eb 100644
--- a/test/Semantics/case01.f90
+++ b/test/Semantics/case01.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Test SELECT CASE Constraints: C1145, C1146, C1147, C1148, C1149
program selectCaseProg
implicit none
diff --git a/test/Semantics/coarrays01.f90 b/test/Semantics/coarrays01.f90
index 5b8c7e5..32c4592 100644
--- a/test/Semantics/coarrays01.f90
+++ b/test/Semantics/coarrays01.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Test selector and team-value in CHANGE TEAM statement
! OK
diff --git a/test/Semantics/common.sh b/test/Semantics/common.sh
index ac2dab7..22cdc9b 100644
--- a/test/Semantics/common.sh
+++ b/test/Semantics/common.sh
@@ -1,7 +1,8 @@
# Common functionality for test scripts
# Process arguments, expecting source file as 1st; optional path to f18 as 2nd
-# Set: $F18 to the path to f18 with options; $temp to an empty temp directory;
-# and $src to the full path of the single source argument.
+# Set: $FLANG_FC1 to the path to the Flang frontend driver with options; $temp
+# to an empty temp directory; and $src to the full path of the single source
+# argument.
function die {
echo "$(basename $0): $*" >&2
@@ -22,4 +23,4 @@
shift
[[ ! -f $1 ]] && die "f18 executable not found: $1"
-F18="$*"
+FLANG_FC1="$*"
diff --git a/test/Semantics/complex01.f90 b/test/Semantics/complex01.f90
index 8049a13..48c6830 100644
--- a/test/Semantics/complex01.f90
+++ b/test/Semantics/complex01.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! C718 Each named constant in a complex literal constant shall be of type
! integer or real.
subroutine s()
diff --git a/test/Semantics/computed-goto01.f90 b/test/Semantics/computed-goto01.f90
index c2b4337..e8ac2ff 100644
--- a/test/Semantics/computed-goto01.f90
+++ b/test/Semantics/computed-goto01.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Check that a basic computed goto compiles
INTEGER, DIMENSION (2) :: B
diff --git a/test/Semantics/computed-goto02.f90 b/test/Semantics/computed-goto02.f90
index bb0f895..409281f 100644
--- a/test/Semantics/computed-goto02.f90
+++ b/test/Semantics/computed-goto02.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Check that computed goto express must be a scalar integer expression
! TODO: PGI, for example, accepts a float & converts the value to int.
diff --git a/test/Semantics/critical01.f90 b/test/Semantics/critical01.f90
index 5e28c73..0caf051 100644
--- a/test/Semantics/critical01.f90
+++ b/test/Semantics/critical01.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
!C1117
subroutine test1(a, i)
diff --git a/test/Semantics/critical02.f90 b/test/Semantics/critical02.f90
index ae329eb..0e18aec 100644
--- a/test/Semantics/critical02.f90
+++ b/test/Semantics/critical02.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
!C1118
subroutine test1
diff --git a/test/Semantics/critical03.f90 b/test/Semantics/critical03.f90
index 5c469ea..852d208 100644
--- a/test/Semantics/critical03.f90
+++ b/test/Semantics/critical03.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
!C1119
subroutine test1(a, i)
diff --git a/test/Semantics/data01.f90 b/test/Semantics/data01.f90
index 84872d3..7ea0139 100644
--- a/test/Semantics/data01.f90
+++ b/test/Semantics/data01.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
!Test for checking data constraints, C882-C887
module m1
type person
diff --git a/test/Semantics/data02.f90 b/test/Semantics/data02.f90
index 0d20f1c..3eacdb4 100644
--- a/test/Semantics/data02.f90
+++ b/test/Semantics/data02.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Check that expressions are analyzed in data statements
subroutine s1
diff --git a/test/Semantics/data03.f90 b/test/Semantics/data03.f90
index f5b6503..5a5f9dc 100644
--- a/test/Semantics/data03.f90
+++ b/test/Semantics/data03.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
!Testing data constraints : C874 - C875, C878 - C881
module m
integer, target :: modarray(1)
diff --git a/test/Semantics/data04.f90 b/test/Semantics/data04.f90
index 8e6735e..7cfa5ac 100644
--- a/test/Semantics/data04.f90
+++ b/test/Semantics/data04.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
!Testing data constraints : C876, C877
module m
integer :: first
diff --git a/test/Semantics/data06.f90 b/test/Semantics/data06.f90
index 898606a..84d875e 100644
--- a/test/Semantics/data06.f90
+++ b/test/Semantics/data06.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! DATA statement errors
subroutine s1
type :: t1
diff --git a/test/Semantics/data07.f90 b/test/Semantics/data07.f90
index 6f47c26..abf8753 100644
--- a/test/Semantics/data07.f90
+++ b/test/Semantics/data07.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
module m
contains
subroutine s1
diff --git a/test/Semantics/data10.f90 b/test/Semantics/data10.f90
index 244f995..ab0e12f 100644
--- a/test/Semantics/data10.f90
+++ b/test/Semantics/data10.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
type :: t
integer :: n
end type
diff --git a/test/Semantics/deallocate01.f90 b/test/Semantics/deallocate01.f90
index 10ae941..5e1af73 100644
--- a/test/Semantics/deallocate01.f90
+++ b/test/Semantics/deallocate01.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Test that DEALLOCATE works
INTEGER, PARAMETER :: maxvalue=1024
diff --git a/test/Semantics/deallocate04.f90 b/test/Semantics/deallocate04.f90
index a5a7431..8e26f61 100644
--- a/test/Semantics/deallocate04.f90
+++ b/test/Semantics/deallocate04.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Check for type errors in DEALLOCATE statements
INTEGER, PARAMETER :: maxvalue=1024
diff --git a/test/Semantics/deallocate05.f90 b/test/Semantics/deallocate05.f90
index 4a54469..418c607 100644
--- a/test/Semantics/deallocate05.f90
+++ b/test/Semantics/deallocate05.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Check for semantic errors in DEALLOCATE statements
Module share
diff --git a/test/Semantics/deallocate06.f90 b/test/Semantics/deallocate06.f90
index fc9ff14..28d8d69 100644
--- a/test/Semantics/deallocate06.f90
+++ b/test/Semantics/deallocate06.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Test deallocate of use- and host-associated variables
module m1
diff --git a/test/Semantics/doconcurrent01.f90 b/test/Semantics/doconcurrent01.f90
index ac1f431..ac4be8a 100644
--- a/test/Semantics/doconcurrent01.f90
+++ b/test/Semantics/doconcurrent01.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! C1141
! A reference to the procedure IEEE_SET_HALTING_MODE ! from the intrinsic
! module IEEE_EXCEPTIONS, shall not ! appear within a DO CONCURRENT construct.
diff --git a/test/Semantics/doconcurrent05.f90 b/test/Semantics/doconcurrent05.f90
index 693320b..4ee4ba2 100644
--- a/test/Semantics/doconcurrent05.f90
+++ b/test/Semantics/doconcurrent05.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! C1167 -- An exit-stmt shall not appear within a DO CONCURRENT construct if
! it belongs to that construct or an outer construct.
diff --git a/test/Semantics/doconcurrent06.f90 b/test/Semantics/doconcurrent06.f90
index d12bd47..e3a8b7a 100644
--- a/test/Semantics/doconcurrent06.f90
+++ b/test/Semantics/doconcurrent06.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! C1167 -- An exit-stmt shall not appear within a DO CONCURRENT construct if
! it belongs to that construct or an outer construct.
diff --git a/test/Semantics/doconcurrent08.f90 b/test/Semantics/doconcurrent08.f90
index b2687b0..1d2e5e9 100644
--- a/test/Semantics/doconcurrent08.f90
+++ b/test/Semantics/doconcurrent08.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! C1140 -- A statement that might result in the deallocation of a polymorphic
! entity shall not appear within a DO CONCURRENT construct.
module m1
diff --git a/test/Semantics/dosemantics01.f90 b/test/Semantics/dosemantics01.f90
index f5a3ab8..f4da0c2 100644
--- a/test/Semantics/dosemantics01.f90
+++ b/test/Semantics/dosemantics01.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! C1131 -- check valid and invalid DO loop naming
PROGRAM C1131
diff --git a/test/Semantics/dosemantics02.f90 b/test/Semantics/dosemantics02.f90
index 57f6681..7873f35 100644
--- a/test/Semantics/dosemantics02.f90
+++ b/test/Semantics/dosemantics02.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! C1121 -- any procedure referenced in a concurrent header must be pure
! Also, check that the step expressions are not zero. This is prohibited by
diff --git a/test/Semantics/dosemantics04.f90 b/test/Semantics/dosemantics04.f90
index 6d844e6..fb3af04 100644
--- a/test/Semantics/dosemantics04.f90
+++ b/test/Semantics/dosemantics04.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! C1123 -- Expressions in DO CONCURRENT header cannot reference variables
! declared in the same header
PROGRAM dosemantics04
diff --git a/test/Semantics/dosemantics05.f90 b/test/Semantics/dosemantics05.f90
index e23a221..38af52c 100644
--- a/test/Semantics/dosemantics05.f90
+++ b/test/Semantics/dosemantics05.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Test DO loop semantics for constraint C1130 --
! The constraint states that "If the locality-spec DEFAULT ( NONE ) appears in a
! DO CONCURRENT statement; a variable that is a local or construct entity of a
diff --git a/test/Semantics/dosemantics06.f90 b/test/Semantics/dosemantics06.f90
index 70a90af..f315b07 100644
--- a/test/Semantics/dosemantics06.f90
+++ b/test/Semantics/dosemantics06.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! C1131, C1133 -- check valid and invalid DO loop naming
! C1131 (R1119) If the do-stmt of a do-construct specifies a do-construct-name,
! the corresponding end-do shall be an end-do-stmt specifying the same
diff --git a/test/Semantics/dosemantics07.f90 b/test/Semantics/dosemantics07.f90
index 0ecc155..1c1ecb7 100644
--- a/test/Semantics/dosemantics07.f90
+++ b/test/Semantics/dosemantics07.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
!C1132
! If the do-stmt is a nonlabel-do-stmt, the corresponding end-do shall be an
! end-do-stmt.
diff --git a/test/Semantics/dosemantics08.f90 b/test/Semantics/dosemantics08.f90
index 85a2e95..1ceee99 100644
--- a/test/Semantics/dosemantics08.f90
+++ b/test/Semantics/dosemantics08.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! C1138 --
! A branch (11.2) within a DO CONCURRENT construct shall not have a branch
! target that is outside the construct.
diff --git a/test/Semantics/dosemantics09.f90 b/test/Semantics/dosemantics09.f90
index 7f60c62..933e8b1 100644
--- a/test/Semantics/dosemantics09.f90
+++ b/test/Semantics/dosemantics09.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
!C1129
!A variable that is referenced by the scalar-mask-expr of a
!concurrent-header or by any concurrent-limit or concurrent-step in that
diff --git a/test/Semantics/dosemantics10.f90 b/test/Semantics/dosemantics10.f90
index 91f5eee..5ba1bb5 100644
--- a/test/Semantics/dosemantics10.f90
+++ b/test/Semantics/dosemantics10.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! C1134 A CYCLE statement must be within a DO construct
!
! C1166 An EXIT statement must be within a DO construct
diff --git a/test/Semantics/dosemantics11.f90 b/test/Semantics/dosemantics11.f90
index cfee632..4d24149 100644
--- a/test/Semantics/dosemantics11.f90
+++ b/test/Semantics/dosemantics11.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! C1135 A cycle-stmt shall not appear within a CHANGE TEAM, CRITICAL, or DO
! CONCURRENT construct if it belongs to an outer construct.
!
diff --git a/test/Semantics/dosemantics12.f90 b/test/Semantics/dosemantics12.f90
index 7d65c0a..ed51697 100644
--- a/test/Semantics/dosemantics12.f90
+++ b/test/Semantics/dosemantics12.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Copyright (c) 2019, NVIDIA CORPORATION. All rights reserved.
!
! Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/Semantics/empty.f90 b/test/Semantics/empty.f90
index ff8f642..a1950c2 100644
--- a/test/Semantics/empty.f90
+++ b/test/Semantics/empty.f90
@@ -1,4 +1,4 @@
-! RUN: %f18 -fsyntax-only %s
+! RUN: %flang_fc1 -fsyntax-only %s
! RUN: rm -rf %t && mkdir %t
! RUN: touch %t/empty.f90
-! RUN: %f18 -fsyntax-only %t/empty.f90
+! RUN: %flang_fc1 -fsyntax-only %t/empty.f90
diff --git a/test/Semantics/entry01.f90 b/test/Semantics/entry01.f90
index b441c95..3ef5433 100644
--- a/test/Semantics/entry01.f90
+++ b/test/Semantics/entry01.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Tests valid and invalid ENTRY statements
module m1
diff --git a/test/Semantics/equivalence01.f90 b/test/Semantics/equivalence01.f90
index e75d954..5508e02 100644
--- a/test/Semantics/equivalence01.f90
+++ b/test/Semantics/equivalence01.f90
@@ -1,4 +1,4 @@
-!RUN: %S/test_errors.sh %s %t %f18
+!RUN: %S/test_errors.sh %s %t %flang_fc1
subroutine s1
integer i, j
real r(2)
diff --git a/test/Semantics/expr-errors01.f90 b/test/Semantics/expr-errors01.f90
index a3ebad1..f34a1c7 100644
--- a/test/Semantics/expr-errors01.f90
+++ b/test/Semantics/expr-errors01.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! C1003 - can't parenthesize function call returning procedure pointer
module m1
type :: dt
diff --git a/test/Semantics/expr-errors02.f90 b/test/Semantics/expr-errors02.f90
index af6c531..6c838fd 100644
--- a/test/Semantics/expr-errors02.f90
+++ b/test/Semantics/expr-errors02.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Test specification expressions
module m
diff --git a/test/Semantics/expr-errors03.f90 b/test/Semantics/expr-errors03.f90
index 059e80a..55ebf26 100644
--- a/test/Semantics/expr-errors03.f90
+++ b/test/Semantics/expr-errors03.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Regression test for subscript error recovery
module m
implicit none
diff --git a/test/Semantics/final01.f90 b/test/Semantics/final01.f90
index 3f59150..bde9bcb 100644
--- a/test/Semantics/final01.f90
+++ b/test/Semantics/final01.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Test FINAL subroutine constraints C786-C789
module m1
external :: external
diff --git a/test/Semantics/final02.f90 b/test/Semantics/final02.f90
index f613a42..8de8973 100644
--- a/test/Semantics/final02.f90
+++ b/test/Semantics/final02.f90
@@ -1,4 +1,4 @@
-!RUN: %f18 -fsyntax-only %s 2>&1 | FileCheck %s
+!RUN: %flang_fc1 -fsyntax-only %s 2>&1 | FileCheck %s
module m
type :: t1
integer :: n
diff --git a/test/Semantics/forall01.f90 b/test/Semantics/forall01.f90
index 2dec645..59d69cf 100644
--- a/test/Semantics/forall01.f90
+++ b/test/Semantics/forall01.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
subroutine forall1
real :: a(9)
!ERROR: 'i' is already declared in this scoping unit
diff --git a/test/Semantics/if_arith01.f90 b/test/Semantics/if_arith01.f90
index abce953..6206f4e 100644
--- a/test/Semantics/if_arith01.f90
+++ b/test/Semantics/if_arith01.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Check that a basic arithmetic if compiles.
if ( A ) 100, 200, 300
diff --git a/test/Semantics/if_arith02.f90 b/test/Semantics/if_arith02.f90
index 06cf423..20f447a 100644
--- a/test/Semantics/if_arith02.f90
+++ b/test/Semantics/if_arith02.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Check that only labels are allowed in arithmetic if statements.
! TODO: Revisit error message "expected 'ASSIGN'" etc.
! TODO: Revisit error message "expected one of '0123456789'"
diff --git a/test/Semantics/if_arith03.f90 b/test/Semantics/if_arith03.f90
index e4ace92..4da057e 100644
--- a/test/Semantics/if_arith03.f90
+++ b/test/Semantics/if_arith03.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
!ERROR: Label '600' was not found
diff --git a/test/Semantics/if_arith04.f90 b/test/Semantics/if_arith04.f90
index f2be27b..5065713 100644
--- a/test/Semantics/if_arith04.f90
+++ b/test/Semantics/if_arith04.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Make sure arithmetic if expressions are non-complex numeric exprs.
INTEGER I
diff --git a/test/Semantics/if_construct01.f90 b/test/Semantics/if_construct01.f90
index 0ca7090..450cd67 100644
--- a/test/Semantics/if_construct01.f90
+++ b/test/Semantics/if_construct01.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Simple check that if constructs are ok.
if (a < b) then
diff --git a/test/Semantics/if_construct02.f90 b/test/Semantics/if_construct02.f90
index 74ef5fe..a1cf683 100644
--- a/test/Semantics/if_construct02.f90
+++ b/test/Semantics/if_construct02.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Check that if constructs only accept scalar logical expressions.
! TODO: expand the test to check this restriction for more types.
diff --git a/test/Semantics/if_stmt01.f90 b/test/Semantics/if_stmt01.f90
index 12a3d50..07c2878 100644
--- a/test/Semantics/if_stmt01.f90
+++ b/test/Semantics/if_stmt01.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Simple check that if statements are ok.
IF (A > 0.0) A = LOG (A)
diff --git a/test/Semantics/if_stmt02.f90 b/test/Semantics/if_stmt02.f90
index 08c07c0..8482109 100644
--- a/test/Semantics/if_stmt02.f90
+++ b/test/Semantics/if_stmt02.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
!ERROR: IF statement is not allowed in IF statement
IF (A > 0.0) IF (B < 0.0) A = LOG (A)
END
diff --git a/test/Semantics/if_stmt03.f90 b/test/Semantics/if_stmt03.f90
index 5da1c4e..acd67a9 100644
--- a/test/Semantics/if_stmt03.f90
+++ b/test/Semantics/if_stmt03.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Check that non-logical expressions are not allowed.
! Check that non-scalar expressions are not allowed.
! TODO: Insure all non-logicals are prohibited.
diff --git a/test/Semantics/implicit01.f90 b/test/Semantics/implicit01.f90
index c8c268f..3c848b8 100644
--- a/test/Semantics/implicit01.f90
+++ b/test/Semantics/implicit01.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
subroutine s1
implicit none
!ERROR: More than one IMPLICIT NONE statement
diff --git a/test/Semantics/implicit02.f90 b/test/Semantics/implicit02.f90
index 282fb9a..168d779 100644
--- a/test/Semantics/implicit02.f90
+++ b/test/Semantics/implicit02.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
subroutine s1
implicit none
!ERROR: IMPLICIT statement after IMPLICIT NONE or IMPLICIT NONE(TYPE) statement
diff --git a/test/Semantics/implicit03.f90 b/test/Semantics/implicit03.f90
index 0d937a9..91e60b6 100644
--- a/test/Semantics/implicit03.f90
+++ b/test/Semantics/implicit03.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
subroutine s1
implicit integer(a-z)
!ERROR: IMPLICIT NONE statement after IMPLICIT statement
diff --git a/test/Semantics/implicit04.f90 b/test/Semantics/implicit04.f90
index d8430b6..3fb20b2 100644
--- a/test/Semantics/implicit04.f90
+++ b/test/Semantics/implicit04.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
subroutine s
parameter(a=1.0)
!ERROR: IMPLICIT NONE statement after PARAMETER statement
diff --git a/test/Semantics/implicit05.f90 b/test/Semantics/implicit05.f90
index 6f7380d..eaa7116 100644
--- a/test/Semantics/implicit05.f90
+++ b/test/Semantics/implicit05.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
subroutine s
!ERROR: 'a' does not follow 'b' alphabetically
implicit integer(b-a)
diff --git a/test/Semantics/implicit06.f90 b/test/Semantics/implicit06.f90
index 5c8e0e1..64053af 100644
--- a/test/Semantics/implicit06.f90
+++ b/test/Semantics/implicit06.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
subroutine s1
implicit integer(a-c)
!ERROR: More than one implicit type specified for 'c'
diff --git a/test/Semantics/implicit07.f90 b/test/Semantics/implicit07.f90
index 5362f91..2eb491e 100644
--- a/test/Semantics/implicit07.f90
+++ b/test/Semantics/implicit07.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
implicit none(external)
external x
integer :: f, i
diff --git a/test/Semantics/implicit08.f90 b/test/Semantics/implicit08.f90
index b1b33ba..ba75db8 100644
--- a/test/Semantics/implicit08.f90
+++ b/test/Semantics/implicit08.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
subroutine s1
block
!ERROR: IMPLICIT statement is not allowed in a BLOCK construct
diff --git a/test/Semantics/implicit09.f90 b/test/Semantics/implicit09.f90
index 30577fc..21bb9ac 100644
--- a/test/Semantics/implicit09.f90
+++ b/test/Semantics/implicit09.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18 -fimplicit-none-type-never
+! RUN: %S/test_errors.sh %s %t %flang_fc1 -fimplicit-none-type-never
subroutine s1
implicit none
i = j + k ! would be error without -fimplicit-none-type-never
diff --git a/test/Semantics/implicit10.f90 b/test/Semantics/implicit10.f90
index a77ada8..84edfb3 100644
--- a/test/Semantics/implicit10.f90
+++ b/test/Semantics/implicit10.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18 -fimplicit-none-type-always
+! RUN: %S/test_errors.sh %s %t %flang_fc1 -fimplicit-none
!ERROR: No explicit type declared for 'f'
function f()
diff --git a/test/Semantics/implicit11.f90 b/test/Semantics/implicit11.f90
index 2c8e138..9598db9 100644
--- a/test/Semantics/implicit11.f90
+++ b/test/Semantics/implicit11.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Test use of implicitly declared variable in specification expression
diff --git a/test/Semantics/init01.f90 b/test/Semantics/init01.f90
index 2492051..8e99c49 100644
--- a/test/Semantics/init01.f90
+++ b/test/Semantics/init01.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Initializer error tests
subroutine objectpointers(j)
diff --git a/test/Semantics/int-literals.f90 b/test/Semantics/int-literals.f90
index 125b205..a0951ac 100644
--- a/test/Semantics/int-literals.f90
+++ b/test/Semantics/int-literals.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Fortran syntax considers signed int literals in complex literals
! to be a distinct production, not an application of unary +/- to
! an unsigned int literal, so they're used here to test overflow
diff --git a/test/Semantics/io01.f90 b/test/Semantics/io01.f90
index 17b68e4..e5a0b23 100644
--- a/test/Semantics/io01.f90
+++ b/test/Semantics/io01.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
character(len=20) :: access = "direcT"
character(len=20) :: access_(2) = (/"direcT", "streaM"/)
character(len=20) :: action_(2) = (/"reaD ", "writE"/)
diff --git a/test/Semantics/io02.f90 b/test/Semantics/io02.f90
index 9f5235d..f818a74 100644
--- a/test/Semantics/io02.f90
+++ b/test/Semantics/io02.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
integer :: unit10 = 10
integer :: unit11 = 11
integer, parameter :: const_stat = 6666
diff --git a/test/Semantics/io03.f90 b/test/Semantics/io03.f90
index e93646b..a2071e3 100644
--- a/test/Semantics/io03.f90
+++ b/test/Semantics/io03.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
character(kind=1,len=50) internal_file
character(kind=2,len=50) internal_file2
character(kind=4,len=50) internal_file4
diff --git a/test/Semantics/io04.f90 b/test/Semantics/io04.f90
index 8beb446..67feda8 100644
--- a/test/Semantics/io04.f90
+++ b/test/Semantics/io04.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
character(kind=1,len=50) internal_file
character(kind=1,len=100) msg
character(20) sign
diff --git a/test/Semantics/io05.f90 b/test/Semantics/io05.f90
index 666b200..9a78853 100644
--- a/test/Semantics/io05.f90
+++ b/test/Semantics/io05.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
character*20 c(25), cv
character(kind=1,len=59) msg
character, parameter :: const_round = "c'est quoi?"
diff --git a/test/Semantics/io06.f90 b/test/Semantics/io06.f90
index fe3b97f..40ac1df 100644
--- a/test/Semantics/io06.f90
+++ b/test/Semantics/io06.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
character(kind=1,len=100) msg1
character(kind=2,len=200) msg2
character, parameter :: const_msg = 'doof'
diff --git a/test/Semantics/io07.f90 b/test/Semantics/io07.f90
index 75ca54b..fbb54ff 100644
--- a/test/Semantics/io07.f90
+++ b/test/Semantics/io07.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
1001 format(A)
!ERROR: Format statement must be labeled
diff --git a/test/Semantics/io08.f90 b/test/Semantics/io08.f90
index 491f0ad..7496f32 100644
--- a/test/Semantics/io08.f90
+++ b/test/Semantics/io08.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
write(*,*)
write(*,'()')
write(*,'(A)')
diff --git a/test/Semantics/io09.f90 b/test/Semantics/io09.f90
index ce52aab..6b33177 100644
--- a/test/Semantics/io09.f90
+++ b/test/Semantics/io09.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
!ERROR: String edit descriptor in READ format expression
read(*,'("abc")')
diff --git a/test/Semantics/kinds01.f90 b/test/Semantics/kinds01.f90
index 18776df..89a69cf 100644
--- a/test/Semantics/kinds01.f90
+++ b/test/Semantics/kinds01.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_symbols.sh %s %t %f18
+! RUN: %S/test_symbols.sh %s %t %flang_fc1
!DEF: /MainProgram1/jk1 ObjectEntity INTEGER(1)
integer(kind=1) jk1
!DEF: /MainProgram1/js1 ObjectEntity INTEGER(1)
diff --git a/test/Semantics/kinds02.f90 b/test/Semantics/kinds02.f90
index cf22056..e5f9300 100644
--- a/test/Semantics/kinds02.f90
+++ b/test/Semantics/kinds02.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! C712 The value of scalar-int-constant-expr shall be nonnegative and
! shall specify a representation method that exists on the processor.
! C714 The value of kind-param shall be nonnegative.
diff --git a/test/Semantics/kinds03.f90 b/test/Semantics/kinds03.f90
index 00e6c1f..9554e87 100644
--- a/test/Semantics/kinds03.f90
+++ b/test/Semantics/kinds03.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_symbols.sh %s %t %f18
+! RUN: %S/test_symbols.sh %s %t %flang_fc1
!DEF: /MainProgram1/ipdt DerivedType
!DEF: /MainProgram1/ipdt/k TypeParam INTEGER(4)
type :: ipdt(k)
diff --git a/test/Semantics/kinds04.f90 b/test/Semantics/kinds04.f90
index 3274563..e87ec67 100644
--- a/test/Semantics/kinds04.f90
+++ b/test/Semantics/kinds04.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! C716 If both kind-param and exponent-letter appear, exponent-letter
! shall be E.
! C717 The value of kind-param shall specify an approximation method that
diff --git a/test/Semantics/label11.f90 b/test/Semantics/label11.f90
index a660c5b..c1902f3 100644
--- a/test/Semantics/label11.f90
+++ b/test/Semantics/label11.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! C739 If END TYPE is followed by a type-name, the type-name shall be the
! same as that in the corresponding derived-type-stmt.
! C1401 The program-name shall not be included in the end-program-stmt unless
diff --git a/test/Semantics/label16.f90 b/test/Semantics/label16.f90
index 11c5381..71afeee 100644
--- a/test/Semantics/label16.f90
+++ b/test/Semantics/label16.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
subroutine x(n)
call x1(n)
diff --git a/test/Semantics/misc-declarations.f90 b/test/Semantics/misc-declarations.f90
index fdf00dc..564e211 100644
--- a/test/Semantics/misc-declarations.f90
+++ b/test/Semantics/misc-declarations.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Miscellaneous constraint and requirement checking on declarations:
! - 8.5.6.2 & 8.5.6.3 constraints on coarrays
! - 8.5.19 constraints on the VOLATILE attribute
diff --git a/test/Semantics/missing_newline.f90 b/test/Semantics/missing_newline.f90
index 82f9c9c..bca9065 100644
--- a/test/Semantics/missing_newline.f90
+++ b/test/Semantics/missing_newline.f90
@@ -1,4 +1,4 @@
! RUN: echo -n "end program" > %t.f90
-! RUN: %f18 -fsyntax-only %t.f90
+! RUN: %flang_fc1 -fsyntax-only %t.f90
! RUN: echo -ne "\rend program" > %t.f90
-! RUN: %f18 -fsyntax-only %t.f90
+! RUN: %flang_fc1 -fsyntax-only %t.f90
diff --git a/test/Semantics/modfile01.f90 b/test/Semantics/modfile01.f90
index 1880a13..dc1ecbc 100644
--- a/test/Semantics/modfile01.f90
+++ b/test/Semantics/modfile01.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_modfile.sh %s %t %f18
+! RUN: %S/test_modfile.sh %s %t %flang_fc1
! Check correct modfile generation for type with private component.
module m
integer :: i
diff --git a/test/Semantics/modfile02.f90 b/test/Semantics/modfile02.f90
index 3c3a1c6..8532370 100644
--- a/test/Semantics/modfile02.f90
+++ b/test/Semantics/modfile02.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_modfile.sh %s %t %f18
+! RUN: %S/test_modfile.sh %s %t %flang_fc1
! Check modfile generation for private type in public API.
module m
diff --git a/test/Semantics/modfile03.f90 b/test/Semantics/modfile03.f90
index a4b21c8..c602e9d 100644
--- a/test/Semantics/modfile03.f90
+++ b/test/Semantics/modfile03.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_modfile.sh %s %t %f18
+! RUN: %S/test_modfile.sh %s %t %flang_fc1
! Check modfile generation with use-association.
module m1
diff --git a/test/Semantics/modfile04.f90 b/test/Semantics/modfile04.f90
index 9312b75..72858c9 100644
--- a/test/Semantics/modfile04.f90
+++ b/test/Semantics/modfile04.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_modfile.sh %s %t %f18
+! RUN: %S/test_modfile.sh %s %t %flang_fc1
! modfile with subprograms
module m1
diff --git a/test/Semantics/modfile05.f90 b/test/Semantics/modfile05.f90
index 82e9629..d3fff34 100644
--- a/test/Semantics/modfile05.f90
+++ b/test/Semantics/modfile05.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_modfile.sh %s %t %f18
+! RUN: %S/test_modfile.sh %s %t %flang_fc1
! Use-association with VOLATILE or ASYNCHRONOUS
module m1
diff --git a/test/Semantics/modfile06.f90 b/test/Semantics/modfile06.f90
index e463834..0f47d68 100644
--- a/test/Semantics/modfile06.f90
+++ b/test/Semantics/modfile06.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_modfile.sh %s %t %f18
+! RUN: %S/test_modfile.sh %s %t %flang_fc1
! Check modfile generation for external interface
module m
interface
diff --git a/test/Semantics/modfile07.f90 b/test/Semantics/modfile07.f90
index 878e342..df5b4b8 100644
--- a/test/Semantics/modfile07.f90
+++ b/test/Semantics/modfile07.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_modfile.sh %s %t %f18
+! RUN: %S/test_modfile.sh %s %t %flang_fc1
! Check modfile generation for generic interfaces
module m1
interface foo
diff --git a/test/Semantics/modfile08.f90 b/test/Semantics/modfile08.f90
index b87de49..3fa3be0 100644
--- a/test/Semantics/modfile08.f90
+++ b/test/Semantics/modfile08.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_modfile.sh %s %t %f18
+! RUN: %S/test_modfile.sh %s %t %flang_fc1
! Check modfile generation for external declarations
module m
real, external :: a
diff --git a/test/Semantics/modfile09.f90 b/test/Semantics/modfile09.f90
index 0e22f9d..eb8ea3d 100644
--- a/test/Semantics/modfile09.f90
+++ b/test/Semantics/modfile09.f90
@@ -1 +1 @@
-!RUN: %S/test_modfile.sh '%S/Inputs/modfile09-*' %t %f18
+!RUN: %S/test_modfile.sh '%S/Inputs/modfile09-*' %t %flang_fc1
diff --git a/test/Semantics/modfile10.f90 b/test/Semantics/modfile10.f90
index 996178f..d5eb7ee 100644
--- a/test/Semantics/modfile10.f90
+++ b/test/Semantics/modfile10.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_modfile.sh %s %t %f18
+! RUN: %S/test_modfile.sh %s %t %flang_fc1
! Test writing procedure bindings in a derived type.
module m
diff --git a/test/Semantics/modfile11.f90 b/test/Semantics/modfile11.f90
index 3259a5f..e347a16 100644
--- a/test/Semantics/modfile11.f90
+++ b/test/Semantics/modfile11.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_modfile.sh %s %t %f18
+! RUN: %S/test_modfile.sh %s %t %flang_fc1
module m
type t1(a, b, c)
integer, kind :: a
diff --git a/test/Semantics/modfile12.f90 b/test/Semantics/modfile12.f90
index fcea8fc..6171e89 100644
--- a/test/Semantics/modfile12.f90
+++ b/test/Semantics/modfile12.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_modfile.sh %s %t %f18
+! RUN: %S/test_modfile.sh %s %t %flang_fc1
module m
integer(8), parameter :: a = 1, b = 2_8
parameter(n=3,l=-3,e=1.0/3.0)
diff --git a/test/Semantics/modfile13.f90 b/test/Semantics/modfile13.f90
index 8c6ce50..f3882ce 100644
--- a/test/Semantics/modfile13.f90
+++ b/test/Semantics/modfile13.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_modfile.sh %s %t %f18
+! RUN: %S/test_modfile.sh %s %t %flang_fc1
module m
character(2) :: z
character(len=3) :: y
diff --git a/test/Semantics/modfile14.f90 b/test/Semantics/modfile14.f90
index e79a999..0f8c375 100644
--- a/test/Semantics/modfile14.f90
+++ b/test/Semantics/modfile14.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_modfile.sh %s %t %f18
+! RUN: %S/test_modfile.sh %s %t %flang_fc1
module m
type t1
contains
diff --git a/test/Semantics/modfile15.f90 b/test/Semantics/modfile15.f90
index 6051cb7..1ea58f0 100644
--- a/test/Semantics/modfile15.f90
+++ b/test/Semantics/modfile15.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_modfile.sh %s %t %f18
+! RUN: %S/test_modfile.sh %s %t %flang_fc1
module m
type :: t
procedure(a), pointer, pass :: c
diff --git a/test/Semantics/modfile16.f90 b/test/Semantics/modfile16.f90
index c250770..8b51f1b 100644
--- a/test/Semantics/modfile16.f90
+++ b/test/Semantics/modfile16.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_modfile.sh %s %t %f18
+! RUN: %S/test_modfile.sh %s %t %flang_fc1
module m
character(2), parameter :: prefix = 'c_'
integer, bind(c, name='c_a') :: a
diff --git a/test/Semantics/modfile17.f90 b/test/Semantics/modfile17.f90
index 3c7361b..1cae92f 100644
--- a/test/Semantics/modfile17.f90
+++ b/test/Semantics/modfile17.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_modfile.sh %s %t %f18
+! RUN: %S/test_modfile.sh %s %t %flang_fc1
! Tests parameterized derived type instantiation with KIND parameters
module m
diff --git a/test/Semantics/modfile18.f90 b/test/Semantics/modfile18.f90
index a242b3f..c85f478 100644
--- a/test/Semantics/modfile18.f90
+++ b/test/Semantics/modfile18.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_modfile.sh %s %t %f18
+! RUN: %S/test_modfile.sh %s %t %flang_fc1
! Tests folding of array constructors
module m
diff --git a/test/Semantics/modfile19.f90 b/test/Semantics/modfile19.f90
index 78d3e73..41185ac 100644
--- a/test/Semantics/modfile19.f90
+++ b/test/Semantics/modfile19.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_modfile.sh %s %t %f18
+! RUN: %S/test_modfile.sh %s %t %flang_fc1
module m
implicit complex(8)(z)
real :: x
diff --git a/test/Semantics/modfile20.f90 b/test/Semantics/modfile20.f90
index 1be724c..44ac419 100644
--- a/test/Semantics/modfile20.f90
+++ b/test/Semantics/modfile20.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_modfile.sh %s %t %f18
+! RUN: %S/test_modfile.sh %s %t %flang_fc1
! Test modfiles for entities with initialization
module m
integer, parameter :: k8 = 8
diff --git a/test/Semantics/modfile21.f90 b/test/Semantics/modfile21.f90
index 73cf59f..87fdc9b 100644
--- a/test/Semantics/modfile21.f90
+++ b/test/Semantics/modfile21.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_modfile.sh %s %t %f18
+! RUN: %S/test_modfile.sh %s %t %flang_fc1
module m
logical b
bind(C) :: /cb2/
diff --git a/test/Semantics/modfile22.f90 b/test/Semantics/modfile22.f90
index bef096b..e0c05b1 100644
--- a/test/Semantics/modfile22.f90
+++ b/test/Semantics/modfile22.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_modfile.sh %s %t %f18
+! RUN: %S/test_modfile.sh %s %t %flang_fc1
! Test character length conversions in constructors
module m
diff --git a/test/Semantics/modfile23.f90 b/test/Semantics/modfile23.f90
index 828168b..25ca61e 100644
--- a/test/Semantics/modfile23.f90
+++ b/test/Semantics/modfile23.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_modfile.sh %s %t %f18
+! RUN: %S/test_modfile.sh %s %t %flang_fc1
! Test that subprogram interfaces get all of the symbols that they need.
module m1
diff --git a/test/Semantics/modfile24.f90 b/test/Semantics/modfile24.f90
index 2e67e9c..f51f3d8 100644
--- a/test/Semantics/modfile24.f90
+++ b/test/Semantics/modfile24.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_modfile.sh %s %t %f18
+! RUN: %S/test_modfile.sh %s %t %flang_fc1
! Test declarations with coarray-spec
! Different ways of declaring the same coarray.
diff --git a/test/Semantics/modfile25.f90 b/test/Semantics/modfile25.f90
index 76dc61a..6f8c156 100644
--- a/test/Semantics/modfile25.f90
+++ b/test/Semantics/modfile25.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_modfile.sh %s %t %f18
+! RUN: %S/test_modfile.sh %s %t %flang_fc1
! Test compile-time analysis of shapes.
module m1
diff --git a/test/Semantics/modfile26.f90 b/test/Semantics/modfile26.f90
index d8c795b..196c356 100644
--- a/test/Semantics/modfile26.f90
+++ b/test/Semantics/modfile26.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_modfile.sh %s %t %f18
+! RUN: %S/test_modfile.sh %s %t %flang_fc1
! Intrinsics SELECTED_INT_KIND, SELECTED_REAL_KIND, PRECISION, RANGE,
! RADIX, DIGITS
diff --git a/test/Semantics/modfile27.f90 b/test/Semantics/modfile27.f90
index 7e712cb..87a3e4a 100644
--- a/test/Semantics/modfile27.f90
+++ b/test/Semantics/modfile27.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_modfile.sh %s %t %f18
+! RUN: %S/test_modfile.sh %s %t %flang_fc1
! Test folding of combined array references and structure component
! references.
diff --git a/test/Semantics/modfile28.f90 b/test/Semantics/modfile28.f90
index 4ad0643..59c0b87 100644
--- a/test/Semantics/modfile28.f90
+++ b/test/Semantics/modfile28.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_modfile.sh %s %t %f18
+! RUN: %S/test_modfile.sh %s %t %flang_fc1
! Test UTF-8 support in character literals
! Note: Module files are encoded in UTF-8.
diff --git a/test/Semantics/modfile29.f90 b/test/Semantics/modfile29.f90
index 3f9e299..e089875 100644
--- a/test/Semantics/modfile29.f90
+++ b/test/Semantics/modfile29.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_modfile.sh %s %t %f18
+! RUN: %S/test_modfile.sh %s %t %flang_fc1
! Check that implicitly typed entities get a type in the module file.
module m
diff --git a/test/Semantics/modfile30.f90 b/test/Semantics/modfile30.f90
index 275f72c..97161f4 100644
--- a/test/Semantics/modfile30.f90
+++ b/test/Semantics/modfile30.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_modfile.sh %s %t %f18
+! RUN: %S/test_modfile.sh %s %t %flang_fc1
! Verify miscellaneous bugs
! The function result must be declared after the dummy arguments
diff --git a/test/Semantics/modfile31.f90 b/test/Semantics/modfile31.f90
index ad02254..3dca7ad 100644
--- a/test/Semantics/modfile31.f90
+++ b/test/Semantics/modfile31.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_modfile.sh %s %t %f18
+! RUN: %S/test_modfile.sh %s %t %flang_fc1
! Test 7.6 enum values
module m1
diff --git a/test/Semantics/modfile32.f90 b/test/Semantics/modfile32.f90
index f7aaecf..b2013bc 100644
--- a/test/Semantics/modfile32.f90
+++ b/test/Semantics/modfile32.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_modfile.sh %s %t %f18
+! RUN: %S/test_modfile.sh %s %t %flang_fc1
! Resolution of generic names in expressions.
! Test by using generic function in a specification expression that needs
! to be written to a .mod file.
diff --git a/test/Semantics/modfile33.f90 b/test/Semantics/modfile33.f90
index 93845fa..5925778 100644
--- a/test/Semantics/modfile33.f90
+++ b/test/Semantics/modfile33.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_modfile.sh %s %t %f18 -flogical-abbreviations -fxor-operator
+! RUN: %S/test_modfile.sh %s %t %flang_fc1 -flogical-abbreviations -fxor-operator
! Resolution of user-defined operators in expressions.
! Test by using generic function in a specification expression that needs
diff --git a/test/Semantics/modfile34.f90 b/test/Semantics/modfile34.f90
index 59b27c4..717c135 100644
--- a/test/Semantics/modfile34.f90
+++ b/test/Semantics/modfile34.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_modfile.sh %s %t %f18
+! RUN: %S/test_modfile.sh %s %t %flang_fc1
! Test resolution of type-bound generics.
module m1
diff --git a/test/Semantics/modfile35.f90 b/test/Semantics/modfile35.f90
index 1c50bfe..89a7acf 100644
--- a/test/Semantics/modfile35.f90
+++ b/test/Semantics/modfile35.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_modfile.sh %s %t %f18
+! RUN: %S/test_modfile.sh %s %t %flang_fc1
module m1
type :: t1
contains
diff --git a/test/Semantics/modfile36.f90 b/test/Semantics/modfile36.f90
index b111d9e..86d1349 100644
--- a/test/Semantics/modfile36.f90
+++ b/test/Semantics/modfile36.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_modfile.sh %s %t %f18
+! RUN: %S/test_modfile.sh %s %t %flang_fc1
! Check modfile that contains import of use-assocation of another use-association.
diff --git a/test/Semantics/modfile37.f90 b/test/Semantics/modfile37.f90
index 61f64fb..2274253 100644
--- a/test/Semantics/modfile37.f90
+++ b/test/Semantics/modfile37.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_modfile.sh %s %t %f18
+! RUN: %S/test_modfile.sh %s %t %flang_fc1
! Ensure that a dummy procedure's interface's imports
! appear in the module file.
diff --git a/test/Semantics/modfile38.f90 b/test/Semantics/modfile38.f90
index c234568..dde0ea9 100644
--- a/test/Semantics/modfile38.f90
+++ b/test/Semantics/modfile38.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_modfile.sh %s %t %f18
+! RUN: %S/test_modfile.sh %s %t %flang_fc1
! Ensure that an interface with the same name as a derived type
! does not cause that shadowed name to be emitted later than its
diff --git a/test/Semantics/modfile39.f90 b/test/Semantics/modfile39.f90
index f9d7570..6489cc8 100644
--- a/test/Semantics/modfile39.f90
+++ b/test/Semantics/modfile39.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_modfile.sh %s %t %f18
+! RUN: %S/test_modfile.sh %s %t %flang_fc1
! Resolution of specification expression references to generic interfaces
! that resolve to private specific functions.
diff --git a/test/Semantics/modfile40.f90 b/test/Semantics/modfile40.f90
index 392b320..a4825ff 100644
--- a/test/Semantics/modfile40.f90
+++ b/test/Semantics/modfile40.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_modfile.sh %s %t %f18
+! RUN: %S/test_modfile.sh %s %t %flang_fc1
! Ensure that intrinsics in module files retain their 'private' attribute,
! if they are private.
diff --git a/test/Semantics/modifiable01.f90 b/test/Semantics/modifiable01.f90
index ad81e02..f7bfded 100644
--- a/test/Semantics/modifiable01.f90
+++ b/test/Semantics/modifiable01.f90
@@ -1,4 +1,4 @@
-! RUN: not %f18 -fsyntax-only %s 2>&1 | FileCheck %s
+! RUN: not %flang_fc1 -fsyntax-only %s 2>&1 | FileCheck %s
! Test WhyNotModifiable() explanations
module prot
diff --git a/test/Semantics/namelist01.f90 b/test/Semantics/namelist01.f90
index 6f5575a..a3f0683 100644
--- a/test/Semantics/namelist01.f90
+++ b/test/Semantics/namelist01.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Test for checking namelist constraints, C8103-C8105
module dup
diff --git a/test/Semantics/null-init.f90 b/test/Semantics/null-init.f90
index ede47bb..46bb04c 100644
--- a/test/Semantics/null-init.f90
+++ b/test/Semantics/null-init.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Tests valid and invalid NULL initializers
module m1
diff --git a/test/Semantics/null01.f90 b/test/Semantics/null01.f90
index 0cfea52..7c2af0b 100644
--- a/test/Semantics/null01.f90
+++ b/test/Semantics/null01.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! NULL() intrinsic function error tests
subroutine test
diff --git a/test/Semantics/nullify01.f90 b/test/Semantics/nullify01.f90
index 455a7b4..0940410 100644
--- a/test/Semantics/nullify01.f90
+++ b/test/Semantics/nullify01.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Test that NULLIFY works
Module share
diff --git a/test/Semantics/nullify02.f90 b/test/Semantics/nullify02.f90
index b889c9b..9700e3f 100644
--- a/test/Semantics/nullify02.f90
+++ b/test/Semantics/nullify02.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Check for semantic errors in NULLIFY statements
INTEGER, PARAMETER :: maxvalue=1024
diff --git a/test/Semantics/num_images.f90 b/test/Semantics/num_images.f90
index 788b542..260d819 100644
--- a/test/Semantics/num_images.f90
+++ b/test/Semantics/num_images.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Check for semantic errors in num_images() function calls
subroutine test
diff --git a/test/Semantics/oldparam01.f90 b/test/Semantics/oldparam01.f90
index b02ded3..a26db3c 100644
--- a/test/Semantics/oldparam01.f90
+++ b/test/Semantics/oldparam01.f90
@@ -1,4 +1,4 @@
-! RUN: %f18 -falternative-parameter-statement -fdebug-dump-symbols %s 2>&1 | FileCheck %s
+! RUN: %flang_fc1 -falternative-parameter-statement -fdebug-dump-symbols %s 2>&1 | FileCheck %s
! Non-error tests for "old style" PARAMETER statements
diff --git a/test/Semantics/oldparam03.f90 b/test/Semantics/oldparam03.f90
index bc80f00..c28ca03 100644
--- a/test/Semantics/oldparam03.f90
+++ b/test/Semantics/oldparam03.f90
@@ -1,4 +1,4 @@
-! RUN: not %f18 -fsyntax-only %s 2>&1 | FileCheck %s
+! RUN: not %flang_fc1 -fsyntax-only %s 2>&1 | FileCheck %s
! Ensure that old-style PARAMETER statements are disabled by default.
diff --git a/test/Semantics/omp-allocate-directive.f90 b/test/Semantics/omp-allocate-directive.f90
index 62f85ce..5904188 100644
--- a/test/Semantics/omp-allocate-directive.f90
+++ b/test/Semantics/omp-allocate-directive.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18 -fopenmp
+! RUN: %S/test_errors.sh %s %t %flang_fc1 -fopenmp
! Check OpenMP Allocate directive
use omp_lib
diff --git a/test/Semantics/omp-atomic01.f90 b/test/Semantics/omp-atomic01.f90
index 298f9ae..7a61b51 100644
--- a/test/Semantics/omp-atomic01.f90
+++ b/test/Semantics/omp-atomic01.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18 -fopenmp
+! RUN: %S/test_errors.sh %s %t %flang_fc1 -fopenmp
! Semantic checks for OpenMP 5.0 standard 2.17.7 atomic Construct.
use omp_lib
diff --git a/test/Semantics/omp-clause-validity01.f90 b/test/Semantics/omp-clause-validity01.f90
index 505dcba..acff933 100644
--- a/test/Semantics/omp-clause-validity01.f90
+++ b/test/Semantics/omp-clause-validity01.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18 -fopenmp
+! RUN: %S/test_errors.sh %s %t %flang_fc1 -fopenmp
use omp_lib
! Check OpenMP clause validity for the following directives:
!
diff --git a/test/Semantics/omp-copyprivate01.f90 b/test/Semantics/omp-copyprivate01.f90
index 08bca73..cbdc89f 100644
--- a/test/Semantics/omp-copyprivate01.f90
+++ b/test/Semantics/omp-copyprivate01.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18 -fopenmp
+! RUN: %S/test_errors.sh %s %t %flang_fc1 -fopenmp
! OpenMP Version 4.5
! 2.15.4.2 copyprivate Clause
! A list item that appears in a copyprivate clause may not appear in a
diff --git a/test/Semantics/omp-copyprivate02.f90 b/test/Semantics/omp-copyprivate02.f90
index 6a59fe9..3fc3dcb 100644
--- a/test/Semantics/omp-copyprivate02.f90
+++ b/test/Semantics/omp-copyprivate02.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18 -fopenmp
+! RUN: %S/test_errors.sh %s %t %flang_fc1 -fopenmp
! OpenMP Version 4.5
! 2.15.4.2 copyprivate Clause
! Pointers with the INTENT(IN) attribute may not appear in a copyprivate clause.
diff --git a/test/Semantics/omp-copyprivate03.f90 b/test/Semantics/omp-copyprivate03.f90
index f016232..0b0de02 100644
--- a/test/Semantics/omp-copyprivate03.f90
+++ b/test/Semantics/omp-copyprivate03.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18 -fopenmp
+! RUN: %S/test_errors.sh %s %t %flang_fc1 -fopenmp
! OpenMP Version 4.5
! 2.15.4.2 copyprivate Clause
! All list items that appear in the copyprivate clause must be either
diff --git a/test/Semantics/omp-do-schedule03.f90 b/test/Semantics/omp-do-schedule03.f90
index 8184825..dd14aa9 100644
--- a/test/Semantics/omp-do-schedule03.f90
+++ b/test/Semantics/omp-do-schedule03.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_symbols.sh %s %t %f18 -fopenmp
+! RUN: %S/test_symbols.sh %s %t %flang_fc1 -fopenmp
! OpenMP Version 4.5
! 2.7.1 Schedule Clause
! Test that does not catch non constant integer expressions like xx - xx.
diff --git a/test/Semantics/omp-do-schedule04.f90 b/test/Semantics/omp-do-schedule04.f90
index 4dba509..6226c6e 100644
--- a/test/Semantics/omp-do-schedule04.f90
+++ b/test/Semantics/omp-do-schedule04.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_symbols.sh %s %t %f18 -fopenmp
+! RUN: %S/test_symbols.sh %s %t %flang_fc1 -fopenmp
! OpenMP Version 4.5
! 2.7.1 Schedule Clause
! Test that does not catch non constant integer expressions like xx - yy.
diff --git a/test/Semantics/omp-do01-positivecase.f90 b/test/Semantics/omp-do01-positivecase.f90
index 291b5e2..43eebbc 100644
--- a/test/Semantics/omp-do01-positivecase.f90
+++ b/test/Semantics/omp-do01-positivecase.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_symbols.sh %s %t %f18 -fopenmp
+! RUN: %S/test_symbols.sh %s %t %flang_fc1 -fopenmp
! OpenMP Version 4.5
! 2.7.1 Loop Construct
! The loop iteration variable may not appear in a firstprivate directive.
diff --git a/test/Semantics/omp-do04-positivecase.f90 b/test/Semantics/omp-do04-positivecase.f90
index 852aaf1..c6e7147 100644
--- a/test/Semantics/omp-do04-positivecase.f90
+++ b/test/Semantics/omp-do04-positivecase.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_symbols.sh %s %t %f18 -fopenmp
+! RUN: %S/test_symbols.sh %s %t %flang_fc1 -fopenmp
! OpenMP Version 4.5
! 2.7.1 Do Loop Constructs
diff --git a/test/Semantics/omp-do04.f90 b/test/Semantics/omp-do04.f90
index f52f5ef..511bdc5 100644
--- a/test/Semantics/omp-do04.f90
+++ b/test/Semantics/omp-do04.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18 -fopenmp
+! RUN: %S/test_errors.sh %s %t %flang_fc1 -fopenmp
! OpenMP Version 4.5
! 2.7.1 Loop Construct
! The loop iteration variable may not appear in a threadprivate directive.
diff --git a/test/Semantics/omp-do05-positivecase.f90 b/test/Semantics/omp-do05-positivecase.f90
index 72d68d0..c186b3a 100644
--- a/test/Semantics/omp-do05-positivecase.f90
+++ b/test/Semantics/omp-do05-positivecase.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_symbols.sh %s %t %f18 -fopenmp
+! RUN: %S/test_symbols.sh %s %t %flang_fc1 -fopenmp
! OpenMP Version 4.5
! 2.7.1 Loop Construct restrictions on single directive.
! A positive case
diff --git a/test/Semantics/omp-do06-positivecases.f90 b/test/Semantics/omp-do06-positivecases.f90
index 0776817..418dded 100644
--- a/test/Semantics/omp-do06-positivecases.f90
+++ b/test/Semantics/omp-do06-positivecases.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_symbols.sh %s %t %f18 -fopenmp
+! RUN: %S/test_symbols.sh %s %t %flang_fc1 -fopenmp
! OpenMP Version 4.5
! 2.7.1 Loop Construct
! The ordered clause must be present on the loop construct if any ordered
diff --git a/test/Semantics/omp-do09.f90 b/test/Semantics/omp-do09.f90
index 9ce2757..147b179 100644
--- a/test/Semantics/omp-do09.f90
+++ b/test/Semantics/omp-do09.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18 -fopenmp
+! RUN: %S/test_errors.sh %s %t %flang_fc1 -fopenmp
! OpenMP Version 4.5
! 2.7.1 Loop Construct
! The do-loop cannot be a DO WHILE or a DO loop without loop control.
diff --git a/test/Semantics/omp-do10.f90 b/test/Semantics/omp-do10.f90
index b06065c..4cb644e 100644
--- a/test/Semantics/omp-do10.f90
+++ b/test/Semantics/omp-do10.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18 -fopenmp
+! RUN: %S/test_errors.sh %s %t %flang_fc1 -fopenmp
! OpenMP Version 4.5
! 2.7.1 Loop Construct
! The DO loop iteration variable must be of type integer.
diff --git a/test/Semantics/omp-do11.f90 b/test/Semantics/omp-do11.f90
index 7ce034c..5ed097f 100644
--- a/test/Semantics/omp-do11.f90
+++ b/test/Semantics/omp-do11.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_symbols.sh %s %t %f18 -fopenmp
+! RUN: %S/test_symbols.sh %s %t %flang_fc1 -fopenmp
! OpenMP Version 4.5
! 2.7.1 Do Loop Constructs
diff --git a/test/Semantics/omp-do12.f90 b/test/Semantics/omp-do12.f90
index baabb7e..05614e3 100644
--- a/test/Semantics/omp-do12.f90
+++ b/test/Semantics/omp-do12.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_symbols.sh %s %t %f18 -fopenmp
+! RUN: %S/test_symbols.sh %s %t %flang_fc1 -fopenmp
! OpenMP Version 4.5
! 2.7.1 Do Loop constructs.
diff --git a/test/Semantics/omp-do13.f90 b/test/Semantics/omp-do13.f90
index 3a4fb9a..b1081e9 100644
--- a/test/Semantics/omp-do13.f90
+++ b/test/Semantics/omp-do13.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18 -fopenmp
+! RUN: %S/test_errors.sh %s %t %flang_fc1 -fopenmp
! OpenMP Version 4.5
! 2.7.1 Loop Construct
diff --git a/test/Semantics/omp-do14.f90 b/test/Semantics/omp-do14.f90
index df4a369..3eef90e 100644
--- a/test/Semantics/omp-do14.f90
+++ b/test/Semantics/omp-do14.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_symbols.sh %s %t %f18 -fopenmp
+! RUN: %S/test_symbols.sh %s %t %flang_fc1 -fopenmp
! OpenMP Version 4.5
! 2.7.1 Do Loop constructs.
diff --git a/test/Semantics/omp-do15.f90 b/test/Semantics/omp-do15.f90
index 955e6aa..6862ba3 100644
--- a/test/Semantics/omp-do15.f90
+++ b/test/Semantics/omp-do15.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18 -fopenmp
+! RUN: %S/test_errors.sh %s %t %flang_fc1 -fopenmp
! OpenMP Version 4.5
! 2.7.1 Loop Construct
diff --git a/test/Semantics/omp-do16.f90 b/test/Semantics/omp-do16.f90
index 05cd817..80807ec 100644
--- a/test/Semantics/omp-do16.f90
+++ b/test/Semantics/omp-do16.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18 -fopenmp
+! RUN: %S/test_errors.sh %s %t %flang_fc1 -fopenmp
! OpenMP Version 4.5
! 2.7.1 Loop Construct
diff --git a/test/Semantics/omp-do17.f90 b/test/Semantics/omp-do17.f90
index 54f315c..89b3386 100644
--- a/test/Semantics/omp-do17.f90
+++ b/test/Semantics/omp-do17.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_symbols.sh %s %t %f18 -fopenmp
+! RUN: %S/test_symbols.sh %s %t %flang_fc1 -fopenmp
! OpenMP Version 4.5
! 2.7.1 Do Loop constructs.
diff --git a/test/Semantics/omp-firstprivate01.f90 b/test/Semantics/omp-firstprivate01.f90
index 8ff3237..4eb1e47 100644
--- a/test/Semantics/omp-firstprivate01.f90
+++ b/test/Semantics/omp-firstprivate01.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18 -fopenmp
+! RUN: %S/test_errors.sh %s %t %flang_fc1 -fopenmp
! OpenMP Version 4.5
! 2.15.3.4 firstprivate Clause
! Variables that appear in a firstprivate clause on a distribute or
diff --git a/test/Semantics/omp-flush02.f90 b/test/Semantics/omp-flush02.f90
index 6e417c4..705019f 100644
--- a/test/Semantics/omp-flush02.f90
+++ b/test/Semantics/omp-flush02.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18 -fopenmp
+! RUN: %S/test_errors.sh %s %t %flang_fc1 -fopenmp
! Check OpenMP 5.0 - 2.17.8 flush Construct
! Restriction -
diff --git a/test/Semantics/omp-lastprivate01.f90 b/test/Semantics/omp-lastprivate01.f90
index a44cdbd..f69f041 100644
--- a/test/Semantics/omp-lastprivate01.f90
+++ b/test/Semantics/omp-lastprivate01.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18 -fopenmp
+! RUN: %S/test_errors.sh %s %t %flang_fc1 -fopenmp
! OpenMP Version 4.5
! 2.15.3.5 lastprivate Clause
! A variable that appears in a lastprivate clause must be definable.
diff --git a/test/Semantics/omp-lastprivate02.f90 b/test/Semantics/omp-lastprivate02.f90
index a777739..1d2c089 100644
--- a/test/Semantics/omp-lastprivate02.f90
+++ b/test/Semantics/omp-lastprivate02.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18 -fopenmp
+! RUN: %S/test_errors.sh %s %t %flang_fc1 -fopenmp
! OpenMP Version 4.5
! 2.15.3.5 lastprivate Clause
! A list item that is private within a parallel region, or that appears in
diff --git a/test/Semantics/omp-reduction01.f90 b/test/Semantics/omp-reduction01.f90
index f518583..d58e1fa 100644
--- a/test/Semantics/omp-reduction01.f90
+++ b/test/Semantics/omp-reduction01.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18 -fopenmp
+! RUN: %S/test_errors.sh %s %t %flang_fc1 -fopenmp
! OpenMP Version 4.5
! 2.15.3.6 Reduction Clause
program omp_reduction
diff --git a/test/Semantics/omp-reduction02.f90 b/test/Semantics/omp-reduction02.f90
index 1ffbac3..1806e35 100644
--- a/test/Semantics/omp-reduction02.f90
+++ b/test/Semantics/omp-reduction02.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18 -fopenmp
+! RUN: %S/test_errors.sh %s %t %flang_fc1 -fopenmp
! OpenMP Version 4.5
! 2.15.3.6 Reduction Clause
program omp_reduction
diff --git a/test/Semantics/omp-reduction03.f90 b/test/Semantics/omp-reduction03.f90
index d287656..08dca8c 100644
--- a/test/Semantics/omp-reduction03.f90
+++ b/test/Semantics/omp-reduction03.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18 -fopenmp
+! RUN: %S/test_errors.sh %s %t %flang_fc1 -fopenmp
! OpenMP Version 4.5
! 2.15.3.6 Reduction Clause
diff --git a/test/Semantics/omp-reduction04.f90 b/test/Semantics/omp-reduction04.f90
index 5441b2b..aed5b65 100644
--- a/test/Semantics/omp-reduction04.f90
+++ b/test/Semantics/omp-reduction04.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18 -fopenmp
+! RUN: %S/test_errors.sh %s %t %flang_fc1 -fopenmp
! OpenMP Version 4.5
! 2.15.3.6 Reduction Clause
program omp_Reduction
diff --git a/test/Semantics/omp-reduction05.f90 b/test/Semantics/omp-reduction05.f90
index bccd930..cd58f7c 100644
--- a/test/Semantics/omp-reduction05.f90
+++ b/test/Semantics/omp-reduction05.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18 -fopenmp
+! RUN: %S/test_errors.sh %s %t %flang_fc1 -fopenmp
! OpenMP Version 4.5
! 2.15.3.6 Reduction Clause
diff --git a/test/Semantics/omp-reduction06.f90 b/test/Semantics/omp-reduction06.f90
index 9d9ad24..e8ca1a5 100644
--- a/test/Semantics/omp-reduction06.f90
+++ b/test/Semantics/omp-reduction06.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18 -fopenmp
+! RUN: %S/test_errors.sh %s %t %flang_fc1 -fopenmp
! OpenMP Version 4.5
! 2.15.3.6 Reduction Clause
diff --git a/test/Semantics/omp-reduction07.f90 b/test/Semantics/omp-reduction07.f90
index 1123c90..9cf7921 100644
--- a/test/Semantics/omp-reduction07.f90
+++ b/test/Semantics/omp-reduction07.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18 -fopenmp
+! RUN: %S/test_errors.sh %s %t %flang_fc1 -fopenmp
! OpenMP Version 4.5
! 2.15.3.6 Reduction Clause
program omp_reduction
diff --git a/test/Semantics/omp-reduction08.f90 b/test/Semantics/omp-reduction08.f90
index c2c2d49..cb64750 100644
--- a/test/Semantics/omp-reduction08.f90
+++ b/test/Semantics/omp-reduction08.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_symbols.sh %s %t %f18 -fopenmp
+! RUN: %S/test_symbols.sh %s %t %flang_fc1 -fopenmp
! OpenMP Version 4.5
! 2.15.3.6 Reduction Clause Positive cases
diff --git a/test/Semantics/omp-reduction09.f90 b/test/Semantics/omp-reduction09.f90
index 5612d1a..1a215f6 100644
--- a/test/Semantics/omp-reduction09.f90
+++ b/test/Semantics/omp-reduction09.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_symbols.sh %s %t %f18 -fopenmp
+! RUN: %S/test_symbols.sh %s %t %flang_fc1 -fopenmp
! OpenMP Version 4.5
! 2.15.3.6 Reduction Clause Positive cases.
!DEF: /omp_reduction MainProgram
diff --git a/test/Semantics/omp-reduction10.f90 b/test/Semantics/omp-reduction10.f90
index cecbf54..ba8c6a0 100644
--- a/test/Semantics/omp-reduction10.f90
+++ b/test/Semantics/omp-reduction10.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18 -fopenmp
+! RUN: %S/test_errors.sh %s %t %flang_fc1 -fopenmp
! OpenMP Version 4.5
! 2.15.3.6 Reduction Clause
program omp_reduction
diff --git a/test/Semantics/omp-resolve06.f90 b/test/Semantics/omp-resolve06.f90
index 0909c0f..543a438 100644
--- a/test/Semantics/omp-resolve06.f90
+++ b/test/Semantics/omp-resolve06.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18 -fopenmp
+! RUN: %S/test_errors.sh %s %t %flang_fc1 -fopenmp
use omp_lib
!2.11.4 Allocate Clause
!For any list item that is specified in the allocate
diff --git a/test/Semantics/omp-single01.f90 b/test/Semantics/omp-single01.f90
index ea09872..7abc0a2 100644
--- a/test/Semantics/omp-single01.f90
+++ b/test/Semantics/omp-single01.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18 -fopenmp
+! RUN: %S/test_errors.sh %s %t %flang_fc1 -fopenmp
! OpenMP Version 4.5
! 2.7.3 single Construct
! Symbol present on multiple clauses
diff --git a/test/Semantics/omp-single02.f90 b/test/Semantics/omp-single02.f90
index bdb0003..04a1cc2 100644
--- a/test/Semantics/omp-single02.f90
+++ b/test/Semantics/omp-single02.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18 -fopenmp
+! RUN: %S/test_errors.sh %s %t %flang_fc1 -fopenmp
! OpenMP Version 4.5
! 2.7.3 single Construct
! Copyprivate variable is not thread private or private in outer context
diff --git a/test/Semantics/omp-symbol01.f90 b/test/Semantics/omp-symbol01.f90
index 46195ed..0246ed8 100644
--- a/test/Semantics/omp-symbol01.f90
+++ b/test/Semantics/omp-symbol01.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_symbols.sh %s %t %f18 -fopenmp
+! RUN: %S/test_symbols.sh %s %t %flang_fc1 -fopenmp
! Test clauses that accept list.
! 2.1 Directive Format
diff --git a/test/Semantics/omp-symbol02.f90 b/test/Semantics/omp-symbol02.f90
index deccdc9..f838146 100644
--- a/test/Semantics/omp-symbol02.f90
+++ b/test/Semantics/omp-symbol02.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_symbols.sh %s %t %f18 -fopenmp
+! RUN: %S/test_symbols.sh %s %t %flang_fc1 -fopenmp
! 1.4.1 Structure of the OpenMP Memory Model
diff --git a/test/Semantics/omp-symbol03.f90 b/test/Semantics/omp-symbol03.f90
index 4baaabc..38e30a4 100644
--- a/test/Semantics/omp-symbol03.f90
+++ b/test/Semantics/omp-symbol03.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_symbols.sh %s %t %f18 -fopenmp
+! RUN: %S/test_symbols.sh %s %t %flang_fc1 -fopenmp
! 1.4.1 Structure of the OpenMP Memory Model
! In the inner OpenMP region, SHARED `a` refers to the `a` in the outer OpenMP
diff --git a/test/Semantics/omp-symbol04.f90 b/test/Semantics/omp-symbol04.f90
index 8d1461d..673e11d 100644
--- a/test/Semantics/omp-symbol04.f90
+++ b/test/Semantics/omp-symbol04.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_symbols.sh %s %t %f18 -fopenmp
+! RUN: %S/test_symbols.sh %s %t %flang_fc1 -fopenmp
! 2.15.3 Data-Sharing Attribute Clauses
! Both PARALLEL and DO (worksharing) directives need to create new scope,
diff --git a/test/Semantics/omp-symbol05.f90 b/test/Semantics/omp-symbol05.f90
index e76b5c1..7ca28de 100644
--- a/test/Semantics/omp-symbol05.f90
+++ b/test/Semantics/omp-symbol05.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_symbols.sh %s %t %f18 -fopenmp
+! RUN: %S/test_symbols.sh %s %t %flang_fc1 -fopenmp
! 2.15.2 threadprivate Directive
! The threadprivate directive specifies that variables are replicated,
diff --git a/test/Semantics/omp-symbol06.f90 b/test/Semantics/omp-symbol06.f90
index 1a031a7..14a652e 100644
--- a/test/Semantics/omp-symbol06.f90
+++ b/test/Semantics/omp-symbol06.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_symbols.sh %s %t %f18 -fopenmp
+! RUN: %S/test_symbols.sh %s %t %flang_fc1 -fopenmp
! 2.15.3 Data-Sharing Attribute Clauses
! A list item that specifies a given variable may not appear in more than
diff --git a/test/Semantics/omp-symbol07.f90 b/test/Semantics/omp-symbol07.f90
index 2098bd8..eef7caa 100644
--- a/test/Semantics/omp-symbol07.f90
+++ b/test/Semantics/omp-symbol07.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_symbols.sh %s %t %f18 -fopenmp
+! RUN: %S/test_symbols.sh %s %t %flang_fc1 -fopenmp
! Generic tests
! 1. subroutine or function calls should not be fixed for DSA or DMA
diff --git a/test/Semantics/omp-symbol08.f90 b/test/Semantics/omp-symbol08.f90
index 233e367..61ea5c3 100644
--- a/test/Semantics/omp-symbol08.f90
+++ b/test/Semantics/omp-symbol08.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_symbols.sh %s %t %f18 -fopenmp
+! RUN: %S/test_symbols.sh %s %t %flang_fc1 -fopenmp
! 2.15.1.1 Predetermined rules for associated do-loops index variable
! a) The loop iteration variable(s) in the associated do-loop(s) of a do,
diff --git a/test/Semantics/procinterface01.f90 b/test/Semantics/procinterface01.f90
index 8f33168..63c83af 100644
--- a/test/Semantics/procinterface01.f90
+++ b/test/Semantics/procinterface01.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_symbols.sh %s %t %f18
+! RUN: %S/test_symbols.sh %s %t %flang_fc1
! Tests for "proc-interface" semantics.
! These cases are all valid.
diff --git a/test/Semantics/reshape.f90 b/test/Semantics/reshape.f90
index 7749df6..6fee2fd 100644
--- a/test/Semantics/reshape.f90
+++ b/test/Semantics/reshape.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
!Tests for RESHAPE
program reshaper
diff --git a/test/Semantics/resolve01.f90 b/test/Semantics/resolve01.f90
index 7373e41..a29a0e0 100644
--- a/test/Semantics/resolve01.f90
+++ b/test/Semantics/resolve01.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
integer :: x
!ERROR: The type of 'x' has already been declared
real :: x
diff --git a/test/Semantics/resolve02.f90 b/test/Semantics/resolve02.f90
index df5b6b5..8df7c1d 100644
--- a/test/Semantics/resolve02.f90
+++ b/test/Semantics/resolve02.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
subroutine s
!ERROR: Declaration of 'x' conflicts with its use as internal procedure
real :: x
diff --git a/test/Semantics/resolve03.f90 b/test/Semantics/resolve03.f90
index 4aca985..d14fb79 100644
--- a/test/Semantics/resolve03.f90
+++ b/test/Semantics/resolve03.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
implicit none
integer :: x
!ERROR: No explicit type declared for 'y'
diff --git a/test/Semantics/resolve04.f90 b/test/Semantics/resolve04.f90
index d0bad7e..53f1bed 100644
--- a/test/Semantics/resolve04.f90
+++ b/test/Semantics/resolve04.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
!ERROR: No explicit type declared for 'f'
function f()
implicit none
diff --git a/test/Semantics/resolve05.f90 b/test/Semantics/resolve05.f90
index 7f36533..365ae71 100644
--- a/test/Semantics/resolve05.f90
+++ b/test/Semantics/resolve05.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
program p
integer :: p ! this is ok
end
diff --git a/test/Semantics/resolve06.f90 b/test/Semantics/resolve06.f90
index 0ea1f7e..e2dfeca 100644
--- a/test/Semantics/resolve06.f90
+++ b/test/Semantics/resolve06.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
implicit none
allocatable :: x
integer :: x
diff --git a/test/Semantics/resolve07.f90 b/test/Semantics/resolve07.f90
index 68dd7d3..5c17224 100644
--- a/test/Semantics/resolve07.f90
+++ b/test/Semantics/resolve07.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
subroutine s1
integer :: x(2)
!ERROR: The dimensions of 'x' have already been declared
diff --git a/test/Semantics/resolve08.f90 b/test/Semantics/resolve08.f90
index 7d978b9..abe2503 100644
--- a/test/Semantics/resolve08.f90
+++ b/test/Semantics/resolve08.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
integer :: g(10)
f(i) = i + 1 ! statement function
g(i) = i + 2 ! mis-parsed array assignment
diff --git a/test/Semantics/resolve09.f90 b/test/Semantics/resolve09.f90
index 9b1173d..93b9781 100644
--- a/test/Semantics/resolve09.f90
+++ b/test/Semantics/resolve09.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
integer :: y
procedure() :: a
procedure(real) :: b
diff --git a/test/Semantics/resolve10.f90 b/test/Semantics/resolve10.f90
index 570ea00..5d00f7e 100644
--- a/test/Semantics/resolve10.f90
+++ b/test/Semantics/resolve10.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
module m
public
type t
diff --git a/test/Semantics/resolve101.f90 b/test/Semantics/resolve101.f90
index 90fca2b..0c9964f 100644
--- a/test/Semantics/resolve101.f90
+++ b/test/Semantics/resolve101.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Ensure that spurious errors do not arise from FinishSpecificationPart
! checking on a nested specification part.
real, save :: x
diff --git a/test/Semantics/resolve102.f90 b/test/Semantics/resolve102.f90
index c5b3f53..6b2a794 100644
--- a/test/Semantics/resolve102.f90
+++ b/test/Semantics/resolve102.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Tests for circularly defined procedures
!ERROR: Procedure 'sub' is recursively defined. Procedures in the cycle: 'sub', 'p2'
diff --git a/test/Semantics/resolve104.f90 b/test/Semantics/resolve104.f90
index 176c9d6..90449da 100644
--- a/test/Semantics/resolve104.f90
+++ b/test/Semantics/resolve104.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Test constant folding of type parameter values both a base value and a
! parameter name are supplied.
!
diff --git a/test/Semantics/resolve11.f90 b/test/Semantics/resolve11.f90
index 06c57b6..0cfd9f2 100644
--- a/test/Semantics/resolve11.f90
+++ b/test/Semantics/resolve11.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
module m
public i
integer, private :: j
diff --git a/test/Semantics/resolve12.f90 b/test/Semantics/resolve12.f90
index 241047a..a66d22d 100644
--- a/test/Semantics/resolve12.f90
+++ b/test/Semantics/resolve12.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
module m1
end
diff --git a/test/Semantics/resolve13.f90 b/test/Semantics/resolve13.f90
index f6105b1..b3b6c94 100644
--- a/test/Semantics/resolve13.f90
+++ b/test/Semantics/resolve13.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
module m1
integer :: x
integer, private :: y
diff --git a/test/Semantics/resolve14.f90 b/test/Semantics/resolve14.f90
index 44ece0b..c0ac4e1 100644
--- a/test/Semantics/resolve14.f90
+++ b/test/Semantics/resolve14.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
module m1
integer :: x
integer :: y
diff --git a/test/Semantics/resolve15.f90 b/test/Semantics/resolve15.f90
index c520c58..b7a3e80 100644
--- a/test/Semantics/resolve15.f90
+++ b/test/Semantics/resolve15.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
module m
real :: var
interface i
diff --git a/test/Semantics/resolve16.f90 b/test/Semantics/resolve16.f90
index 6e8ab5b..f60e41f 100644
--- a/test/Semantics/resolve16.f90
+++ b/test/Semantics/resolve16.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
module m
interface
subroutine sub0
diff --git a/test/Semantics/resolve17.f90 b/test/Semantics/resolve17.f90
index 2a26887..425cc00 100644
--- a/test/Semantics/resolve17.f90
+++ b/test/Semantics/resolve17.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
module m
integer :: foo
!Note: PGI, Intel, and GNU allow this; NAG and Sun do not
diff --git a/test/Semantics/resolve18.f90 b/test/Semantics/resolve18.f90
index 334bb71..4598036 100644
--- a/test/Semantics/resolve18.f90
+++ b/test/Semantics/resolve18.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
module m1
implicit none
contains
diff --git a/test/Semantics/resolve19.f90 b/test/Semantics/resolve19.f90
index b8fe8e8..75f143d 100644
--- a/test/Semantics/resolve19.f90
+++ b/test/Semantics/resolve19.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
module m
interface a
subroutine s(x)
diff --git a/test/Semantics/resolve20.f90 b/test/Semantics/resolve20.f90
index 94bd4c1..2bb78c6 100644
--- a/test/Semantics/resolve20.f90
+++ b/test/Semantics/resolve20.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
module m
abstract interface
subroutine foo
diff --git a/test/Semantics/resolve21.f90 b/test/Semantics/resolve21.f90
index 0b63f16..73634de 100644
--- a/test/Semantics/resolve21.f90
+++ b/test/Semantics/resolve21.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
subroutine s1
type :: t
integer :: i
diff --git a/test/Semantics/resolve22.f90 b/test/Semantics/resolve22.f90
index 33d5c95..4176fd6 100644
--- a/test/Semantics/resolve22.f90
+++ b/test/Semantics/resolve22.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
subroutine s1
!OK: interface followed by type with same name
interface t
diff --git a/test/Semantics/resolve23.f90 b/test/Semantics/resolve23.f90
index 01178a1..28c9754 100644
--- a/test/Semantics/resolve23.f90
+++ b/test/Semantics/resolve23.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
module m
type :: t
real :: y
diff --git a/test/Semantics/resolve24.f90 b/test/Semantics/resolve24.f90
index 22fe6ae..985eebc 100644
--- a/test/Semantics/resolve24.f90
+++ b/test/Semantics/resolve24.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
subroutine test1
!ERROR: Generic interface 'foo' has both a function and a subroutine
interface foo
diff --git a/test/Semantics/resolve25.f90 b/test/Semantics/resolve25.f90
index ec0a98a..e31d894 100644
--- a/test/Semantics/resolve25.f90
+++ b/test/Semantics/resolve25.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
module m
interface foo
real function s1(x)
diff --git a/test/Semantics/resolve26.f90 b/test/Semantics/resolve26.f90
index 6daf8b6..1650c06 100644
--- a/test/Semantics/resolve26.f90
+++ b/test/Semantics/resolve26.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
module m1
interface
module subroutine s()
diff --git a/test/Semantics/resolve27.f90 b/test/Semantics/resolve27.f90
index 72d6918..ceb062f 100644
--- a/test/Semantics/resolve27.f90
+++ b/test/Semantics/resolve27.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
module m
interface
module subroutine s()
diff --git a/test/Semantics/resolve28.f90 b/test/Semantics/resolve28.f90
index c5c23a1..f11c990 100644
--- a/test/Semantics/resolve28.f90
+++ b/test/Semantics/resolve28.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
subroutine s
type t
end type
diff --git a/test/Semantics/resolve29.f90 b/test/Semantics/resolve29.f90
index d9ad4aa..dbcae41 100644
--- a/test/Semantics/resolve29.f90
+++ b/test/Semantics/resolve29.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
module m
type t1
end type
diff --git a/test/Semantics/resolve30.f90 b/test/Semantics/resolve30.f90
index f42da96..2e92328 100644
--- a/test/Semantics/resolve30.f90
+++ b/test/Semantics/resolve30.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
subroutine s1
integer x
block
diff --git a/test/Semantics/resolve31.f90 b/test/Semantics/resolve31.f90
index f22f7e5..e6cc9e2 100644
--- a/test/Semantics/resolve31.f90
+++ b/test/Semantics/resolve31.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! C735 If EXTENDS appears, SEQUENCE shall not appear.
! C738 The same private-or-sequence shall not appear more than once in a
! given derived-type-def .
diff --git a/test/Semantics/resolve32.f90 b/test/Semantics/resolve32.f90
index 326ae1f..43ba45a 100644
--- a/test/Semantics/resolve32.f90
+++ b/test/Semantics/resolve32.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
module m2
public s2, s4
private s3
diff --git a/test/Semantics/resolve33.f90 b/test/Semantics/resolve33.f90
index 380a1ab..79c2f09 100644
--- a/test/Semantics/resolve33.f90
+++ b/test/Semantics/resolve33.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Derived type parameters
! C731 The same type-param-name shall not appear more than once in a given
! derived-type-stmt.
diff --git a/test/Semantics/resolve34.f90 b/test/Semantics/resolve34.f90
index 93dcd2a..4497a30 100644
--- a/test/Semantics/resolve34.f90
+++ b/test/Semantics/resolve34.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Extended derived types
module m1
diff --git a/test/Semantics/resolve35.f90 b/test/Semantics/resolve35.f90
index db66adb..9dfba8e 100644
--- a/test/Semantics/resolve35.f90
+++ b/test/Semantics/resolve35.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Construct names
subroutine s1
diff --git a/test/Semantics/resolve36.f90 b/test/Semantics/resolve36.f90
index 38bc21d..55017ff 100644
--- a/test/Semantics/resolve36.f90
+++ b/test/Semantics/resolve36.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! C1568 The procedure-name shall have been declared to be a separate module
! procedure in the containing program unit or an ancestor of that program unit.
diff --git a/test/Semantics/resolve37.f90 b/test/Semantics/resolve37.f90
index 1db9d13..a33b0a3 100644
--- a/test/Semantics/resolve37.f90
+++ b/test/Semantics/resolve37.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! C701 The type-param-value for a kind type parameter shall be a constant
! expression. This constraint looks like a mistake in the standard.
integer, parameter :: k = 8
diff --git a/test/Semantics/resolve38.f90 b/test/Semantics/resolve38.f90
index a36ecce..2a4e88e 100644
--- a/test/Semantics/resolve38.f90
+++ b/test/Semantics/resolve38.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! C772
module m1
type t1
diff --git a/test/Semantics/resolve39.f90 b/test/Semantics/resolve39.f90
index 47a019e..c3eca9f 100644
--- a/test/Semantics/resolve39.f90
+++ b/test/Semantics/resolve39.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
subroutine s1
implicit none
real(8) :: x = 2.0
diff --git a/test/Semantics/resolve40.f90 b/test/Semantics/resolve40.f90
index 3ac59ac..eb8150d 100644
--- a/test/Semantics/resolve40.f90
+++ b/test/Semantics/resolve40.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
subroutine s1
namelist /nl/x
block
diff --git a/test/Semantics/resolve41.f90 b/test/Semantics/resolve41.f90
index 61e935f..de864ce 100644
--- a/test/Semantics/resolve41.f90
+++ b/test/Semantics/resolve41.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
module m
implicit none
real, parameter :: a = 8.0
diff --git a/test/Semantics/resolve42.f90 b/test/Semantics/resolve42.f90
index 0ae7459..f406397 100644
--- a/test/Semantics/resolve42.f90
+++ b/test/Semantics/resolve42.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
subroutine s1
!ERROR: Array 'z' without ALLOCATABLE or POINTER attribute must have explicit shape
common x, y(4), z(:)
diff --git a/test/Semantics/resolve43.f90 b/test/Semantics/resolve43.f90
index 18b8fa6..1cd97f9 100644
--- a/test/Semantics/resolve43.f90
+++ b/test/Semantics/resolve43.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Error tests for structure constructors.
! Errors caught by expression resolution are tested elsewhere; these are the
! errors meant to be caught by name resolution, as well as acceptable use
diff --git a/test/Semantics/resolve44.f90 b/test/Semantics/resolve44.f90
index 3ad70d4..f11f6a5 100644
--- a/test/Semantics/resolve44.f90
+++ b/test/Semantics/resolve44.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Error tests for recursive use of derived types.
! C744 If neither the POINTER nor the ALLOCATABLE attribute is specified, the
! declaration-type-spec in the component-def-stmt shall specify an intrinsic
diff --git a/test/Semantics/resolve45.f90 b/test/Semantics/resolve45.f90
index c2a9691..4b0b4d9 100644
--- a/test/Semantics/resolve45.f90
+++ b/test/Semantics/resolve45.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
function f1(x, y)
integer x
!ERROR: SAVE attribute may not be applied to dummy argument 'x'
diff --git a/test/Semantics/resolve46.f90 b/test/Semantics/resolve46.f90
index 03b43fa..dcce05e 100644
--- a/test/Semantics/resolve46.f90
+++ b/test/Semantics/resolve46.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! C1030 - pointers to intrinsic procedures
program main
intrinsic :: cos ! a specific & generic intrinsic name
diff --git a/test/Semantics/resolve47.f90 b/test/Semantics/resolve47.f90
index a469a97..723754b 100644
--- a/test/Semantics/resolve47.f90
+++ b/test/Semantics/resolve47.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
module m1
!ERROR: Logical constant '.true.' may not be used as a defined operator
interface operator(.TRUE.)
diff --git a/test/Semantics/resolve48.f90 b/test/Semantics/resolve48.f90
index 78f8b3a..f6928d7 100644
--- a/test/Semantics/resolve48.f90
+++ b/test/Semantics/resolve48.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Test correct use-association of a derived type.
module m1
implicit none
diff --git a/test/Semantics/resolve49.f90 b/test/Semantics/resolve49.f90
index 5ead078..2c0df6b 100644
--- a/test/Semantics/resolve49.f90
+++ b/test/Semantics/resolve49.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Test section subscript
program p1
real :: a(10,10)
diff --git a/test/Semantics/resolve50.f90 b/test/Semantics/resolve50.f90
index 3ba16fa..1889a5a 100644
--- a/test/Semantics/resolve50.f90
+++ b/test/Semantics/resolve50.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Test coarray association in CHANGE TEAM statement
subroutine s1
diff --git a/test/Semantics/resolve51.f90 b/test/Semantics/resolve51.f90
index bf97776..08ff4d1 100644
--- a/test/Semantics/resolve51.f90
+++ b/test/Semantics/resolve51.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Test SELECT TYPE errors: C1157
subroutine s1()
diff --git a/test/Semantics/resolve52.f90 b/test/Semantics/resolve52.f90
index 0b3ebd0..2e74840 100644
--- a/test/Semantics/resolve52.f90
+++ b/test/Semantics/resolve52.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Tests for C760:
! The passed-object dummy argument shall be a scalar, nonpointer, nonallocatable
! dummy data object with the same declared type as the type being defined;
diff --git a/test/Semantics/resolve53.f90 b/test/Semantics/resolve53.f90
index 64b0d53..c2cbe38 100644
--- a/test/Semantics/resolve53.f90
+++ b/test/Semantics/resolve53.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! 15.4.3.4.5 Restrictions on generic declarations
! Specific procedures of generic interfaces must be distinguishable.
diff --git a/test/Semantics/resolve54.f90 b/test/Semantics/resolve54.f90
index 32c3826..f0a0740 100644
--- a/test/Semantics/resolve54.f90
+++ b/test/Semantics/resolve54.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Tests based on examples in C.10.6
! C.10.6(10)
diff --git a/test/Semantics/resolve55.f90 b/test/Semantics/resolve55.f90
index 48af4ab..80aad3c 100644
--- a/test/Semantics/resolve55.f90
+++ b/test/Semantics/resolve55.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Tests for C1128:
! A variable-name that appears in a LOCAL or LOCAL_INIT locality-spec shall not
! have the ALLOCATABLE; INTENT (IN); or OPTIONAL attribute; shall not be of
diff --git a/test/Semantics/resolve56.f90 b/test/Semantics/resolve56.f90
index 9b4dc2f..29585c4 100644
--- a/test/Semantics/resolve56.f90
+++ b/test/Semantics/resolve56.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Test that associations constructs can be correctly combined. The intrinsic
! functions are not what is tested here, they are only use to reveal the types
! of local variables.
diff --git a/test/Semantics/resolve57.f90 b/test/Semantics/resolve57.f90
index fb15414..0ce006c 100644
--- a/test/Semantics/resolve57.f90
+++ b/test/Semantics/resolve57.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Tests for the last sentence of C1128:
!A variable-name that is not permitted to appear in a variable definition
!context shall not appear in a LOCAL or LOCAL_INIT locality-spec.
diff --git a/test/Semantics/resolve58.f90 b/test/Semantics/resolve58.f90
index ca43590..8c1cf26 100644
--- a/test/Semantics/resolve58.f90
+++ b/test/Semantics/resolve58.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
subroutine s1(x, y)
!ERROR: Array pointer 'x' must have deferred shape or assumed rank
real, pointer :: x(1:) ! C832
diff --git a/test/Semantics/resolve59.f90 b/test/Semantics/resolve59.f90
index 4deead1..76f619c 100644
--- a/test/Semantics/resolve59.f90
+++ b/test/Semantics/resolve59.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Testing 15.6.2.2 point 4 (What function-name refers to depending on the
! presence of RESULT).
diff --git a/test/Semantics/resolve60.f90 b/test/Semantics/resolve60.f90
index ea475ed..a03079f 100644
--- a/test/Semantics/resolve60.f90
+++ b/test/Semantics/resolve60.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Testing 7.6 enum
! OK
diff --git a/test/Semantics/resolve61.f90 b/test/Semantics/resolve61.f90
index fc27caa..3df1861 100644
--- a/test/Semantics/resolve61.f90
+++ b/test/Semantics/resolve61.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
program p1
integer(8) :: a, b, c, d
pointer(a, b)
diff --git a/test/Semantics/resolve62.f90 b/test/Semantics/resolve62.f90
index 7ad7dff..7314a5f 100644
--- a/test/Semantics/resolve62.f90
+++ b/test/Semantics/resolve62.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Resolve generic based on number of arguments
subroutine s1
interface f
diff --git a/test/Semantics/resolve63.f90 b/test/Semantics/resolve63.f90
index 7fe6fac..7ae6458 100644
--- a/test/Semantics/resolve63.f90
+++ b/test/Semantics/resolve63.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Invalid operand types when user-defined operator is available
module m1
type :: t
diff --git a/test/Semantics/resolve65.f90 b/test/Semantics/resolve65.f90
index e02a90c..14e8715 100644
--- a/test/Semantics/resolve65.f90
+++ b/test/Semantics/resolve65.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Test restrictions on what subprograms can be used for defined assignment.
module m1
diff --git a/test/Semantics/resolve66.f90 b/test/Semantics/resolve66.f90
index 33a027a..f812cfb 100644
--- a/test/Semantics/resolve66.f90
+++ b/test/Semantics/resolve66.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Test that user-defined assignment is used in the right places
module m1
diff --git a/test/Semantics/resolve67.f90 b/test/Semantics/resolve67.f90
index 08042a2..ce5ae8b 100644
--- a/test/Semantics/resolve67.f90
+++ b/test/Semantics/resolve67.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Test restrictions on what subprograms can be used for defined operators.
! See: 15.4.3.4.2
diff --git a/test/Semantics/resolve68.f90 b/test/Semantics/resolve68.f90
index 2a452a0..67eb1a3 100644
--- a/test/Semantics/resolve68.f90
+++ b/test/Semantics/resolve68.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Test resolution of type-bound generics.
module m1
diff --git a/test/Semantics/resolve69.f90 b/test/Semantics/resolve69.f90
index a1c8cf6..515d860 100644
--- a/test/Semantics/resolve69.f90
+++ b/test/Semantics/resolve69.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
subroutine s1()
! C701 (R701) The type-param-value for a kind type parameter shall be a
! constant expression.
diff --git a/test/Semantics/resolve70.f90 b/test/Semantics/resolve70.f90
index d86016e..be49df5 100644
--- a/test/Semantics/resolve70.f90
+++ b/test/Semantics/resolve70.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! C703 (R702) The derived-type-spec shall not specify an abstract type (7.5.7).
! This constraint refers to the derived-type-spec in a type-spec. A type-spec
! can appear in an ALLOCATE statement, an ac-spec for an array constructor, and
diff --git a/test/Semantics/resolve71.f90 b/test/Semantics/resolve71.f90
index 8d204d3..bcebd7c 100644
--- a/test/Semantics/resolve71.f90
+++ b/test/Semantics/resolve71.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! C708 An entity declared with the CLASS keyword shall be a dummy argument
! or have the ALLOCATABLE or POINTER attribute.
subroutine s()
diff --git a/test/Semantics/resolve72.f90 b/test/Semantics/resolve72.f90
index 516bd68..4b955f3 100644
--- a/test/Semantics/resolve72.f90
+++ b/test/Semantics/resolve72.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! C709 An assumed-type entity shall be a dummy data object that does not have
! the ALLOCATABLE, CODIMENSION, INTENT (OUT), POINTER, or VALUE attribute and
! is not an explicit-shape array.
diff --git a/test/Semantics/resolve73.f90 b/test/Semantics/resolve73.f90
index 5640c18..4e29346 100644
--- a/test/Semantics/resolve73.f90
+++ b/test/Semantics/resolve73.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! C721 A type-param-value of * shall be used only
! * to declare a dummy argument,
! * to declare a named constant,
diff --git a/test/Semantics/resolve74.f90 b/test/Semantics/resolve74.f90
index 4c0ca07..1dedb18 100644
--- a/test/Semantics/resolve74.f90
+++ b/test/Semantics/resolve74.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! C722 A function name shall not be declared with an asterisk type-param-value
! unless it is of type CHARACTER and is the name of a dummy function or the
! name of the result of an external function.
diff --git a/test/Semantics/resolve75.f90 b/test/Semantics/resolve75.f90
index a9a8ca0..1f49639 100644
--- a/test/Semantics/resolve75.f90
+++ b/test/Semantics/resolve75.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! C726 The length specified for a character statement function or for a
! statement function dummy argument of type character shall be a constant
! expression.
diff --git a/test/Semantics/resolve76.f90 b/test/Semantics/resolve76.f90
index 7d40184..14afed1 100644
--- a/test/Semantics/resolve76.f90
+++ b/test/Semantics/resolve76.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! 15.6.2.5(3)
diff --git a/test/Semantics/resolve77.f90 b/test/Semantics/resolve77.f90
index e21de90..e38efab 100644
--- a/test/Semantics/resolve77.f90
+++ b/test/Semantics/resolve77.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Tests valid and invalid usage of forward references to procedures
! in specification expressions.
module m
diff --git a/test/Semantics/resolve78.f90 b/test/Semantics/resolve78.f90
index 92a6cf8..99b15db 100644
--- a/test/Semantics/resolve78.f90
+++ b/test/Semantics/resolve78.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
module m
! C743 No component-attr-spec shall appear more than once in a
! given component-def-stmt.
diff --git a/test/Semantics/resolve79.f90 b/test/Semantics/resolve79.f90
index 1545aad..822e1f8 100644
--- a/test/Semantics/resolve79.f90
+++ b/test/Semantics/resolve79.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
module m
! C755 The same proc-component-attr-spec shall not appear more than once in a
! given proc-component-def-stmt.
diff --git a/test/Semantics/resolve80.f90 b/test/Semantics/resolve80.f90
index 689187d..0179718 100644
--- a/test/Semantics/resolve80.f90
+++ b/test/Semantics/resolve80.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
module m
!C778 The same binding-attr shall not appear more than once in a given
!binding-attr-list.
diff --git a/test/Semantics/resolve81.f90 b/test/Semantics/resolve81.f90
index 956d57f..66b05ca 100644
--- a/test/Semantics/resolve81.f90
+++ b/test/Semantics/resolve81.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! C801 The same attr-spec shall not appear more than once in a given
! type-declaration-stmt.
!
diff --git a/test/Semantics/resolve82.f90 b/test/Semantics/resolve82.f90
index 10cde73..63ce1da 100644
--- a/test/Semantics/resolve82.f90
+++ b/test/Semantics/resolve82.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! C815 An entity shall not be explicitly given any attribute more than once in
! a scoping unit.
!
diff --git a/test/Semantics/resolve83.f90 b/test/Semantics/resolve83.f90
index 94f36a1..2361700 100644
--- a/test/Semantics/resolve83.f90
+++ b/test/Semantics/resolve83.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
module m
! For C1543
diff --git a/test/Semantics/resolve84.f90 b/test/Semantics/resolve84.f90
index 89b8f2e..251178a 100644
--- a/test/Semantics/resolve84.f90
+++ b/test/Semantics/resolve84.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! C729 A derived type type-name shall not be DOUBLEPRECISION or the same as
! the name of any intrinsic type defined in this document.
subroutine s()
diff --git a/test/Semantics/resolve85.f90 b/test/Semantics/resolve85.f90
index 44e6519..59cb3e2 100644
--- a/test/Semantics/resolve85.f90
+++ b/test/Semantics/resolve85.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
module m
! C730 The same type-attr-spec shall not appear more than once in a given
! derived-type-stmt.
diff --git a/test/Semantics/resolve86.f90 b/test/Semantics/resolve86.f90
index 4885e63..b2d116f 100644
--- a/test/Semantics/resolve86.f90
+++ b/test/Semantics/resolve86.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! C736 If EXTENDS appears and the type being defined has a coarray ultimate
! component, its parent type shall have a coarray ultimate component.
!
diff --git a/test/Semantics/resolve87.f90 b/test/Semantics/resolve87.f90
index f2f098b..1eb7662 100644
--- a/test/Semantics/resolve87.f90
+++ b/test/Semantics/resolve87.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! C737 If EXTENDS appears and the type being defined has a potential
! subobject component of type EVENT_TYPE or LOCK_TYPE from the intrinsic
! module ISO_FORTRAN_ENV, its parent type shall be EVENT_TYPE or LOCK_TYPE
diff --git a/test/Semantics/resolve88.f90 b/test/Semantics/resolve88.f90
index bbbdac2..43e9ea1 100644
--- a/test/Semantics/resolve88.f90
+++ b/test/Semantics/resolve88.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! C746, C747, and C748
module m
use ISO_FORTRAN_ENV
diff --git a/test/Semantics/resolve89.f90 b/test/Semantics/resolve89.f90
index eaa902b..e5a595d 100644
--- a/test/Semantics/resolve89.f90
+++ b/test/Semantics/resolve89.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! C750 Each bound in the explicit-shape-spec shall be a specification
! expression in which there are no references to specification functions or
! the intrinsic functions ALLOCATED, ASSOCIATED, EXTENDS_TYPE_OF, PRESENT,
diff --git a/test/Semantics/resolve90.f90 b/test/Semantics/resolve90.f90
index 12fc707..f938501 100644
--- a/test/Semantics/resolve90.f90
+++ b/test/Semantics/resolve90.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Testing for pointer constant, along with :
! C751 A component shall not have both the ALLOCATABLE and POINTER attributes.
! C752 If the CONTIGUOUS attribute is specified, the component shall be an
diff --git a/test/Semantics/resolve91.f90 b/test/Semantics/resolve91.f90
index c94cda4..292dc9e 100644
--- a/test/Semantics/resolve91.f90
+++ b/test/Semantics/resolve91.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Tests for duplicate definitions and initializations, mostly of procedures
module m
procedure(real), pointer :: p
diff --git a/test/Semantics/resolve92.f90 b/test/Semantics/resolve92.f90
index 7a6bd87..f7469d9 100644
--- a/test/Semantics/resolve92.f90
+++ b/test/Semantics/resolve92.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
module m1
implicit none
diff --git a/test/Semantics/resolve93.f90 b/test/Semantics/resolve93.f90
index 2c3764d..78521be 100644
--- a/test/Semantics/resolve93.f90
+++ b/test/Semantics/resolve93.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
subroutine s1()
character(10) str
character(10) str1
diff --git a/test/Semantics/resolve94.f90 b/test/Semantics/resolve94.f90
index bf91d61..ac055d8 100644
--- a/test/Semantics/resolve94.f90
+++ b/test/Semantics/resolve94.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! C929 No specifier shall appear more than once in a given
! image-selector-spec-list.
! C930 TEAM and TEAM_NUMBER shall not both appear in the same
diff --git a/test/Semantics/resolve95.f90 b/test/Semantics/resolve95.f90
index 78ff09d..e913b59 100644
--- a/test/Semantics/resolve95.f90
+++ b/test/Semantics/resolve95.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Test SELECT TYPE and ASSOCIATE errors: C1103
subroutine s1()
diff --git a/test/Semantics/resolve96.f90 b/test/Semantics/resolve96.f90
index b026e04..21d5983 100644
--- a/test/Semantics/resolve96.f90
+++ b/test/Semantics/resolve96.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Check distinguishability for specific procedures of defined operators and
! assignment. These are different from names because there a normal generic
diff --git a/test/Semantics/resolve97.f90 b/test/Semantics/resolve97.f90
index 67adff2..ecdfe59 100644
--- a/test/Semantics/resolve97.f90
+++ b/test/Semantics/resolve97.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Check errors from illegal (10.1.12 para 2) forward references
! in specification expressions to entities declared later in the
diff --git a/test/Semantics/resolve98.f90 b/test/Semantics/resolve98.f90
index dede042..d000ff9 100644
--- a/test/Semantics/resolve98.f90
+++ b/test/Semantics/resolve98.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Errors when comparing LOGICAL operands
diff --git a/test/Semantics/resolve99.f90 b/test/Semantics/resolve99.f90
index a1c8c10..cbd708f 100644
--- a/test/Semantics/resolve99.f90
+++ b/test/Semantics/resolve99.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Tests for the index-name of a FORALL statement
diff --git a/test/Semantics/save01.f90 b/test/Semantics/save01.f90
index 3c2ed58..444d927 100644
--- a/test/Semantics/save01.f90
+++ b/test/Semantics/save01.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
MODULE test
SAVE
CONTAINS
diff --git a/test/Semantics/select-rank.f90 b/test/Semantics/select-rank.f90
index 6211256..1746c2f 100644
--- a/test/Semantics/select-rank.f90
+++ b/test/Semantics/select-rank.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
!Tests for SELECT RANK Construct(R1148)
program select_rank
diff --git a/test/Semantics/select-rank02.f90 b/test/Semantics/select-rank02.f90
index 51c4f66..9726578 100644
--- a/test/Semantics/select-rank02.f90
+++ b/test/Semantics/select-rank02.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
!Shape analysis related tests for SELECT RANK Construct(R1148)
program select_rank
diff --git a/test/Semantics/selecttype01.f90 b/test/Semantics/selecttype01.f90
index c726c23..4bb400f 100644
--- a/test/Semantics/selecttype01.f90
+++ b/test/Semantics/selecttype01.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Test for checking select type constraints,
module m1
use ISO_C_BINDING
diff --git a/test/Semantics/selecttype02.f90 b/test/Semantics/selecttype02.f90
index 3f4226e..84cbedb 100644
--- a/test/Semantics/selecttype02.f90
+++ b/test/Semantics/selecttype02.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
module m1
use ISO_C_BINDING
type shape
diff --git a/test/Semantics/selecttype03.f90 b/test/Semantics/selecttype03.f90
index e989eb1..e6c2139 100644
--- a/test/Semantics/selecttype03.f90
+++ b/test/Semantics/selecttype03.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Test various conditions in C1158.
implicit none
diff --git a/test/Semantics/separate-mp01.f90 b/test/Semantics/separate-mp01.f90
index 0dc4991..0126ffa 100644
--- a/test/Semantics/separate-mp01.f90
+++ b/test/Semantics/separate-mp01.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! case 1: ma_create_new_fun' was not declared a separate module procedure
module m1
diff --git a/test/Semantics/separate-mp02.f90 b/test/Semantics/separate-mp02.f90
index 3dd717d..9fcec39 100644
--- a/test/Semantics/separate-mp02.f90
+++ b/test/Semantics/separate-mp02.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! When a module subprogram has the MODULE prefix the following must match
! with the corresponding separate module procedure interface body:
diff --git a/test/Semantics/shape.f90 b/test/Semantics/shape.f90
index efd1788..ec99136 100644
--- a/test/Semantics/shape.f90
+++ b/test/Semantics/shape.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Test comparisons that use the intrinsic SHAPE() as an operand
program testShape
contains
diff --git a/test/Semantics/spec-expr.f90 b/test/Semantics/spec-expr.f90
index 58ffe12..e9f3442 100644
--- a/test/Semantics/spec-expr.f90
+++ b/test/Semantics/spec-expr.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Tests for the 14 items that specify a "specification expression" in section
! 10.1.11
diff --git a/test/Semantics/stop01.f90 b/test/Semantics/stop01.f90
index 0563eea..ea04172 100644
--- a/test/Semantics/stop01.f90
+++ b/test/Semantics/stop01.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
program main
implicit none
integer :: i = -1
diff --git a/test/Semantics/structconst01.f90 b/test/Semantics/structconst01.f90
index dd2ae34..96e2dbc 100644
--- a/test/Semantics/structconst01.f90
+++ b/test/Semantics/structconst01.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Error tests for structure constructors.
! Errors caught by name resolution are tested elsewhere; these are the
! errors meant to be caught by expression semantic analysis, as well as
diff --git a/test/Semantics/structconst02.f90 b/test/Semantics/structconst02.f90
index 71a743a..b8df1a4 100644
--- a/test/Semantics/structconst02.f90
+++ b/test/Semantics/structconst02.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Error tests for structure constructors: per-component type
! (in)compatibility.
diff --git a/test/Semantics/structconst03.f90 b/test/Semantics/structconst03.f90
index f98f05c..221b2ce 100644
--- a/test/Semantics/structconst03.f90
+++ b/test/Semantics/structconst03.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Error tests for structure constructors: C1594 violations
! from assigning globally-visible data to POINTER components.
! test/Semantics/structconst04.f90 is this same test without type
diff --git a/test/Semantics/structconst04.f90 b/test/Semantics/structconst04.f90
index 57001f2..535d207 100644
--- a/test/Semantics/structconst04.f90
+++ b/test/Semantics/structconst04.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18
+! RUN: %S/test_errors.sh %s %t %flang_fc1
! Error tests for structure constructors: C1594 violations
! from assigning globally-visible data to POINTER components.
! This test is structconst03.f90 with the type parameters removed.
diff --git a/test/Semantics/symbol01.f90 b/test/Semantics/symbol01.f90
index 4dc2cb7..08a4709 100644
--- a/test/Semantics/symbol01.f90
+++ b/test/Semantics/symbol01.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_symbols.sh %s %t %f18
+! RUN: %S/test_symbols.sh %s %t %flang_fc1
! Test that intent-stmt and subprogram prefix and suffix are resolved.
!DEF: /m Module
diff --git a/test/Semantics/symbol02.f90 b/test/Semantics/symbol02.f90
index add4293..fbe39f4 100644
--- a/test/Semantics/symbol02.f90
+++ b/test/Semantics/symbol02.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_symbols.sh %s %t %f18
+! RUN: %S/test_symbols.sh %s %t %flang_fc1
! Test host association in module subroutine and internal subroutine.
!DEF: /m Module
diff --git a/test/Semantics/symbol03.f90 b/test/Semantics/symbol03.f90
index a398d8d..84468df 100644
--- a/test/Semantics/symbol03.f90
+++ b/test/Semantics/symbol03.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_symbols.sh %s %t %f18
+! RUN: %S/test_symbols.sh %s %t %flang_fc1
! Test host association in internal subroutine of main program.
!DEF: /main MainProgram
diff --git a/test/Semantics/symbol05.f90 b/test/Semantics/symbol05.f90
index 9fb6b43..6142168 100644
--- a/test/Semantics/symbol05.f90
+++ b/test/Semantics/symbol05.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_symbols.sh %s %t %f18
+! RUN: %S/test_symbols.sh %s %t %flang_fc1
! Explicit and implicit entities in blocks
!DEF: /s1 (Subroutine) Subprogram
diff --git a/test/Semantics/symbol06.f90 b/test/Semantics/symbol06.f90
index 553cb14..026d352 100644
--- a/test/Semantics/symbol06.f90
+++ b/test/Semantics/symbol06.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_symbols.sh %s %t %f18
+! RUN: %S/test_symbols.sh %s %t %flang_fc1
!DEF: /main MainProgram
program main
!DEF: /main/t1 DerivedType
diff --git a/test/Semantics/symbol07.f90 b/test/Semantics/symbol07.f90
index f0bc0e4..cbc22e5 100644
--- a/test/Semantics/symbol07.f90
+++ b/test/Semantics/symbol07.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_symbols.sh %s %t %f18
+! RUN: %S/test_symbols.sh %s %t %flang_fc1
!DEF: /main MainProgram
program main
implicit complex(z)
diff --git a/test/Semantics/symbol08.f90 b/test/Semantics/symbol08.f90
index 711a9f6..0c6c335 100644
--- a/test/Semantics/symbol08.f90
+++ b/test/Semantics/symbol08.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_symbols.sh %s %t %f18
+! RUN: %S/test_symbols.sh %s %t %flang_fc1
!DEF: /main MainProgram
program main
!DEF: /main/x POINTER ObjectEntity REAL(4)
diff --git a/test/Semantics/symbol09.f90 b/test/Semantics/symbol09.f90
index d3604a1..260f54e 100644
--- a/test/Semantics/symbol09.f90
+++ b/test/Semantics/symbol09.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_symbols.sh %s %t %f18
+! RUN: %S/test_symbols.sh %s %t %flang_fc1
!DEF: /s1 (Subroutine) Subprogram
subroutine s1
!DEF: /s1/a ObjectEntity REAL(4)
diff --git a/test/Semantics/symbol10.f90 b/test/Semantics/symbol10.f90
index 60da43a..64849fe 100644
--- a/test/Semantics/symbol10.f90
+++ b/test/Semantics/symbol10.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_symbols.sh %s %t %f18
+! RUN: %S/test_symbols.sh %s %t %flang_fc1
!DEF: /m1 Module
module m1
contains
diff --git a/test/Semantics/symbol11.f90 b/test/Semantics/symbol11.f90
index 3d2be67..0dfafcd 100644
--- a/test/Semantics/symbol11.f90
+++ b/test/Semantics/symbol11.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_symbols.sh %s %t %f18
+! RUN: %S/test_symbols.sh %s %t %flang_fc1
!DEF: /s1 (Subroutine) Subprogram
subroutine s1
implicit none
diff --git a/test/Semantics/symbol12.f90 b/test/Semantics/symbol12.f90
index 339f170..cffcbdf 100644
--- a/test/Semantics/symbol12.f90
+++ b/test/Semantics/symbol12.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_symbols.sh %s %t %f18
+! RUN: %S/test_symbols.sh %s %t %flang_fc1
! Verify that SAVE attribute is propagated by EQUIVALENCE
!DEF: /s1 (Subroutine) Subprogram
diff --git a/test/Semantics/symbol13.f90 b/test/Semantics/symbol13.f90
index 6052bfc..5a4ad62 100644
--- a/test/Semantics/symbol13.f90
+++ b/test/Semantics/symbol13.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_symbols.sh %s %t %f18
+! RUN: %S/test_symbols.sh %s %t %flang_fc1
! Old-style "*length" specifiers (R723)
!DEF: /f1 (Function) Subprogram CHARACTER(1_8,1)
diff --git a/test/Semantics/symbol14.f90 b/test/Semantics/symbol14.f90
index 7705bdb..3412500 100644
--- a/test/Semantics/symbol14.f90
+++ b/test/Semantics/symbol14.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_symbols.sh %s %t %f18
+! RUN: %S/test_symbols.sh %s %t %flang_fc1
! "Bare" uses of type parameters and components
!DEF: /MainProgram1/t1 DerivedType
diff --git a/test/Semantics/symbol15.f90 b/test/Semantics/symbol15.f90
index 7f307e7..b514455 100644
--- a/test/Semantics/symbol15.f90
+++ b/test/Semantics/symbol15.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_symbols.sh %s %t %f18
+! RUN: %S/test_symbols.sh %s %t %flang_fc1
! Forward references in pointer initializers and TBP bindings.
!DEF: /m Module
diff --git a/test/Semantics/symbol16.f90 b/test/Semantics/symbol16.f90
index 4fa6f2b..def7dc7 100644
--- a/test/Semantics/symbol16.f90
+++ b/test/Semantics/symbol16.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_symbols.sh %s %t %f18
+! RUN: %S/test_symbols.sh %s %t %flang_fc1
! Statement functions
!DEF: /p1 MainProgram
diff --git a/test/Semantics/symbol17.f90 b/test/Semantics/symbol17.f90
index d5b086b..5906a47 100644
--- a/test/Semantics/symbol17.f90
+++ b/test/Semantics/symbol17.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_symbols.sh %s %t %f18
+! RUN: %S/test_symbols.sh %s %t %flang_fc1
! Forward references to derived types (non-error cases)
!DEF: /main MainProgram
diff --git a/test/Semantics/symbol18.f90 b/test/Semantics/symbol18.f90
index c3197d7..fee4352 100644
--- a/test/Semantics/symbol18.f90
+++ b/test/Semantics/symbol18.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_symbols.sh %s %t %f18
+! RUN: %S/test_symbols.sh %s %t %flang_fc1
! Intrinsic function in type declaration statement: type is ignored
diff --git a/test/Semantics/symbol19.f90 b/test/Semantics/symbol19.f90
index 94a6b86..677d0af 100644
--- a/test/Semantics/symbol19.f90
+++ b/test/Semantics/symbol19.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_symbols.sh %s %t %f18
+! RUN: %S/test_symbols.sh %s %t %flang_fc1
! Test that a procedure is only implicitly resolved as an intrinsic function
diff --git a/test/Semantics/test_errors.sh b/test/Semantics/test_errors.sh
index 10feccb..20486b3 100755
--- a/test/Semantics/test_errors.sh
+++ b/test/Semantics/test_errors.sh
@@ -1,8 +1,8 @@
#!/usr/bin/env bash
# Compile a source file and check errors against those listed in the file.
-# Change the compiler by setting the F18 environment variable.
+# Change the compiler by setting the FLANG_FC1 environment variable.
-F18_OPTIONS="-fsyntax-only"
+FLANG_FC1_OPTIONS="-fsyntax-only"
srcdir=$(dirname $0)
source $srcdir/common.sh
[[ ! -f $src ]] && die "File not found: $src"
@@ -12,7 +12,7 @@
expect=$temp/expect
diffs=$temp/diffs
-cmd="$F18 $F18_OPTIONS $src"
+cmd="$FLANG_FC1 $FLANG_FC1_OPTIONS $src"
( cd $temp; $cmd ) > $log 2>&1
if [[ $? -ge 128 ]]; then
cat $log
diff --git a/test/Semantics/test_modfile.sh b/test/Semantics/test_modfile.sh
index a2aef65..f524520 100755
--- a/test/Semantics/test_modfile.sh
+++ b/test/Semantics/test_modfile.sh
@@ -2,7 +2,7 @@
# Compile a source file and compare generated .mod files against expected.
set -e
-F18_OPTIONS="-fdebug-resolve-names -fsyntax-only"
+FLANG_FC1_OPTIONS="-fsyntax-only"
srcdir=$(dirname $0)
source $srcdir/common.sh
@@ -21,7 +21,7 @@
(
cd $temp
ls -1 *.mod > prev_files
- $F18 $F18_OPTIONS $src
+ $FLANG_FC1 $FLANG_FC1_OPTIONS $src
ls -1 *.mod | comm -13 prev_files -
) > $actual_files
expected_files=$(sed -n 's/^!Expect: \(.*\)/\1/p' $src | sort)
diff --git a/test/Semantics/test_symbols.sh b/test/Semantics/test_symbols.sh
index 61ff7fd..56337c2 100755
--- a/test/Semantics/test_symbols.sh
+++ b/test/Semantics/test_symbols.sh
@@ -1,10 +1,10 @@
#!/usr/bin/env bash
-# Compile a source file with '-funparse-with-symbols' and verify
+# Compile a source file with '-fdebug-unparse-with-symbols' and verify
# we get the right symbols in the output, i.e. the output should be
# the same as the input, except for the copyright comment.
-# Change the compiler by setting the F18 environment variable.
+# Change the frontend driver by setting the FLANG_FC1 environment variable.
-F18_OPTIONS="-funparse-with-symbols"
+FLANG_FC1_OPTIONS="-fdebug-unparse-with-symbols"
srcdir=$(dirname $0)
source $srcdir/common.sh
[[ ! -f $src ]] && echo "File not found: $src" && exit 1
@@ -22,7 +22,7 @@
$src > $src1
egrep -v '![DR]EF:' $src1 > $src2 # strip out DEF and REF comments
# compile, inserting comments for symbols:
-( cd $temp; $F18 $F18_OPTIONS $(basename $src2) ) > $src3
+( cd $temp; $FLANG_FC1 $FLANG_FC1_OPTIONS $(basename $src2) ) > $src3
if diff -w -U999999 $src1 $src3 > $diffs; then
echo PASS
