[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

flang/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
 

flang/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

flang/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.
 

flang/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.
 

flang/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

flang/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

flang/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

flang/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.
 

flang/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

flang/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.)

flang/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

flang/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

flang/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([ &

flang/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

flang/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

flang/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

flang/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

flang/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

flang/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
 

flang/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.
 

flang/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

flang/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.
 

flang/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

flang/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

flang/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
 

flang/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)

flang/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
 
 

flang/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
 
 

flang/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
 
 

flang/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)

flang/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, &

flang/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)

flang/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?

flang/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!

flang/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)

flang/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

flang/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 )

flang/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, *, *)

flang/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, *, *)

flang/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)

flang/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

flang/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)

flang/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
 

flang/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

flang/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

flang/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

flang/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)

flang/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!)
 

flang/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!)
 

flang/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()
 

flang/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).

flang/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

flang/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

flang/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.
 

flang/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

flang/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
 

flang/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
 

flang/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

flang/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
 

flang/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

flang/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)

flang/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)

flang/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.
 

flang/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

flang/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.
 

flang/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.
 

flang/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

flang/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

flang/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 

flang/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.)

flang/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

flang/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

flang/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
 

flang/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

flang/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)

flang/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.
 

flang/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

flang/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.

flang/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

flang/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
 

flang/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

flang/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

flang/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 @@ mkdir -p $temp
 shift
 
 [[ ! -f $1 ]] && die "f18 executable not found: $1"
-F18="$*"
+FLANG_FC1="$*"

flang/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()

flang/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

flang/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.
 

flang/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)

flang/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

flang/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)

flang/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

flang/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

flang/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)

flang/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

flang/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

flang/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

flang/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

flang/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

flang/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

flang/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

flang/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