[flang][driver] Remove `%flang-new` from the LIT configuration

[awarzynski]

Summary

%flang-new was introduced in the early days of the new driver to make
a clear distinction between the tests for the current and the new
driver. We have since introduced %flang (compiler driver) and
%flang_fc1 (frontend driver) as the long term solution. This has allowed
us to share tests between flang-new and f18. This patch replaces
all uses of %flang-new with %flang and %flang_fc1.

Some tests are reformatted so that all tests look uniform and are easier
to follow. Where possible, ! REQUIRES: new-flang-driver is deleted so
that more tests can be shared with f18. To facilitate this,
f{no-}implicit-none are introduced in f18 with semantics identical
to flang-new.

Two tests are deleted rather than updated:

• flang/test/Frontend/print-preprocess-C-file.f90
• flang/test/Frontend/print-preprocessed-file.f90

Instead, there is plenty of preprocessor tests in
flang/test/Preprocessing/.

For frontend-only options, RUN lines with the compiler driver are deleted
so that the corresponding files test the frontend functionality rather then
the handling of the corresponding options in the compiler driver. We ought to
introduce a dedicated test for this.

[SouraVX]

LGTM. Thanks for the patch! and congratulations on the milestone of bringing experimental driver to mainline!

[awarzynski]

In D100174#2679128, @SouraVX wrote:

LGTM. Thanks for the patch! and congratulations on the milestone of bringing experimental driver to mainline!

Thank you for taking a look so promptly and for you kind words! Just to clarify, this patch will only delete %flang-new from flang/test/lit.cfg.py. The new driver is still called flang-new, but at least in LIT we will only have %flang and %flang_fc1. One step at a time :)

[SouraVX]

One step at a time :)

+1 :)

[SouraVX]

The new driver is still called flang-new

I presume eventually next step would be replace that as well ?

[awarzynski]

In D100174#2679145, @SouraVX wrote:

The new driver is still called flang-new

I presume eventually next step would be replace that as well ?

Yes, I should be sending an RFC to discuss this shortly (~next couple of weeks).

[awarzynski]

Try to diagnose debug-measure-parse-tree.f90

I've not been able to re-produce the failure from the pre-commit CI, debug-measure-parse-tree.f90 looks fine to me. I'm adding not in front of f18 in order to understand whether it's f18 or FileCheck that's failing. Any other suggestions most welcome!

[awarzynski]

Continue debugging debug-measure-parse-tree.f90

Previous patch revealed that it was f18 that was failing. I'm guessing that it's trying to call an external gfortran compiler and that fails in the pre-commit CI. This can be fixed by adding -fsyntax-only (which we have been adding in other tests for this very reason).

flang/test/Driver/code-gen.f90

-! RUN: not %flang-new %s 2>&1 | FileCheck %s --check-prefix=ERROR
-! RUN: not %flang-new -c %s 2>&1 | FileCheck %s --check-prefix=ERROR
-! RUN: not %flang-new -emit-obj %s 2>&1 | FileCheck %s --check-prefix=ERROR
-! RUN: not %flang-new -fc1 -emit-obj %s 2>&1 | FileCheck %s --check-prefix=ERROR
-
-! REQUIRES: new-flang-driver
-
 ! Although code-generation is not yet available, we do have frontend actions
 ! that correspond to `-c` and `-emit-obj`. For now these actions are just a
 ! placeholder and running them leads to a driver error. This test makes sure
 ! that these actions are indeed run (rather than `-c` or `-emit-obj` being
 ! rejected earlier).
 ! TODO: Replace this file with a proper test once code-generation is available.
 
+! REQUIRES: new-flang-driver
+
+!-----------
+! RUN LINES
+!-----------
+! RUN: not %flang %s 2>&1 | FileCheck %s --check-prefix=ERROR
+! RUN: not %flang -c %s 2>&1 | FileCheck %s --check-prefix=ERROR
+! RUN: not %flang -emit-obj %s 2>&1 | FileCheck %s --check-prefix=ERROR
+! RUN: not %flang -fc1 -emit-obj %s 2>&1 | FileCheck %s --check-prefix=ERROR
+
+!-----------------------
+! EXPECTED OUTPUT
+!-----------------------
 ! ERROR: code-generation is not available yet

flang/test/Driver/debug-measure-parse-tree.f90

 ! Ensure argument -fdebug-measure-parse-tree works as expected.
 
-! REQUIRES: new-flang-driver
-
-!--------------------------
-! FLANG DRIVER (flang-new)
-!--------------------------
-! RUN: not %flang-new -fdebug-measure-parse-tree %s  2>&1 | FileCheck %s --check-prefix=FLANG
-
-!----------------------------------------
-! FRONTEND FLANG DRIVER (flang-new -fc1)
-!----------------------------------------
-! RUN: %flang-new -fc1 -fdebug-measure-parse-tree %s  2>&1 | FileCheck %s --check-prefix=FRONTEND
-
-!----------------------------------
-! EXPECTED OUTPUT WITH `flang-new`
-!----------------------------------
-! FLANG:warning: argument unused during compilation: '-fdebug-measure-parse-tree'
-
-!---------------------------------------
-! EXPECTED OUTPUT WITH `flang-new -fc1`
-!---------------------------------------
+!----------
+! RUN LINE
+!----------
+! RUN: %flang_fc1 -fsyntax-only -fdebug-measure-parse-tree %s  2>&1 | FileCheck %s --check-prefix=FRONTEND
+
+!-----------------
+! EXPECTED OUTPUT
+!-----------------
 ! FRONTEND:Parse tree comprises {{[0-9]+}} objects and occupies {{[0-9]+}} total bytes.
 
 program A
 end

flang/test/Driver/driver-error-cc1.c

-// RUN: not %flang-new %s 2>&1 | FileCheck %s
+// C files are currently not supported (i.e. `flang -cc1`). Make sure that the
+// driver reports this as expected.
 
 // REQUIRES: new-flang-driver
 
-// C files are currently not supported (i.e. `flang -cc1`)
+//-----------
+// RUN LINES
+//-----------
+// RUN: not %flang %s 2>&1 | FileCheck %s
 
+//-----------------------
+// EXPECTED OUTPUT
+//-----------------------
 // CHECK: error: unknown integrated tool '-cc1'. Valid tools include '-fc1'.

flang/test/Driver/driver-error-cc1.cpp

-// RUN: not %flang-new %s 2>&1 | FileCheck %s
+// C++ files are currently not supported (i.e. `flang -cc1`). Make sure that the
+// driver reports this as expected.
 
 // REQUIRES: new-flang-driver
 
-// C++ files are currently not supported (i.e. `flang -cc1`)
+//-----------
+// RUN LINES
+//-----------
+// RUN: not %flang %s 2>&1 | FileCheck %s
 
+//-----------------------
+// EXPECTED OUTPUT
+//-----------------------
 // CHECK: error: unknown integrated tool '-cc1'. Valid tools include '-fc1'.

flang/test/Driver/driver-help-hidden.f90

 ! REQUIRES: new-flang-driver
 
 !--------------------------
 ! FLANG DRIVER (flang-new)
 !--------------------------
-! RUN: %flang-new --help-hidden 2>&1 | FileCheck %s
-! RUN: not %flang-new  -help-hidden 2>&1 | FileCheck %s --check-prefix=ERROR-FLANG
+! RUN: %flang --help-hidden 2>&1 | FileCheck %s
+! RUN: not %flang  -help-hidden 2>&1 | FileCheck %s --check-prefix=ERROR-FLANG
 
 !----------------------------------------
 ! FLANG FRONTEND DRIVER (flang-new -fc1)
 !----------------------------------------
-! RUN: not %flang-new -fc1 --help-hidden 2>&1 | FileCheck %s --check-prefix=ERROR-FLANG-FC1
-! RUN: not %flang-new -fc1  -help-hidden 2>&1 | FileCheck %s --check-prefix=ERROR-FLANG-FC1
+! RUN: not %flang_fc1 --help-hidden 2>&1 | FileCheck %s --check-prefix=ERROR-FLANG-FC1
+! RUN: not %flang_fc1  -help-hidden 2>&1 | FileCheck %s --check-prefix=ERROR-FLANG-FC1
 
 !----------------------------------------------------
 ! EXPECTED OUTPUT FOR FLANG DRIVER (flang-new)
 !----------------------------------------------------
 ! CHECK:USAGE: flang-new
 ! CHECK-EMPTY:
 ! CHECK-NEXT:OPTIONS:
 ! CHECK-NEXT: -###      Print (but do not run) the commands to run for this compilation

flang/test/Driver/driver-help.f90

 ! REQUIRES: new-flang-driver
 
 !--------------------------
-! FLANG DRIVER (flang-new)
+! FLANG DRIVER (flang)
 !--------------------------
-! RUN: %flang-new -help 2>&1 | FileCheck %s --check-prefix=HELP
-! RUN: not %flang-new -helps 2>&1 | FileCheck %s --check-prefix=ERROR
+! RUN: %flang -help 2>&1 | FileCheck %s --check-prefix=HELP
+! RUN: not %flang -helps 2>&1 | FileCheck %s --check-prefix=ERROR
 
 !----------------------------------------
-! FLANG FRONTEND DRIVER (flang-new -fc1)
+! FLANG FRONTEND DRIVER (flang -fc1)
 !----------------------------------------
-! RUN: %flang-new -fc1 -help 2>&1 | FileCheck %s --check-prefix=HELP-FC1
-! RUN: not %flang-new -fc1 -helps 2>&1 | FileCheck %s --check-prefix=ERROR
+! RUN: %flang_fc1 -help 2>&1 | FileCheck %s --check-prefix=HELP-FC1
+! RUN: not %flang_fc1 -helps 2>&1 | FileCheck %s --check-prefix=ERROR
 
 !----------------------------------------------------
-! EXPECTED OUTPUT FOR FLANG DRIVER (flang-new)
+! EXPECTED OUTPUT FOR FLANG DRIVER (flang)
 !----------------------------------------------------
-! HELP:USAGE: flang-new
+! HELP:USAGE: flang
 ! HELP-EMPTY:
 ! HELP-NEXT:OPTIONS:
 ! HELP-NEXT: -###                   Print (but do not run) the commands to run for this compilation
 ! HELP-NEXT: -cpp                   Enable predefined and command line preprocessor macros
 ! HELP-NEXT: -c                     Only run preprocess, compile, and assemble steps
 ! HELP-NEXT: -D <macro>=<value>     Define <macro> to <value> (or 1 if <value> omitted)
 ! HELP-NEXT: -E                     Only run the preprocessor
 ! HELP-NEXT: -falternative-parameter-statement

 ! HELP-NEXT: -pedantic              Warn on language extensions
 ! HELP-NEXT: -std=<value>           Language standard to compile for
 ! HELP-NEXT: -U <macro>             Undefine macro <macro>
 ! HELP-NEXT: --version              Print version information
 ! HELP-NEXT: -W<warning>            Enable the specified warning
 ! HELP-NEXT: -Xflang <arg>          Pass <arg> to the flang compiler
 
 !-------------------------------------------------------------
-! EXPECTED OUTPUT FOR FLANG FRONTEND DRIVER (flang-new -fc1)
+! EXPECTED OUTPUT FOR FLANG FRONTEND DRIVER (flang -fc1)
 !-------------------------------------------------------------
-! HELP-FC1:USAGE: flang-new
+! HELP-FC1:USAGE: flang
 ! HELP-FC1-EMPTY:
 ! HELP-FC1-NEXT:OPTIONS:
 ! HELP-FC1-NEXT: -cpp                   Enable predefined and command line preprocessor macros
 ! HELP-FC1-NEXT: -D <macro>=<value>     Define <macro> to <value> (or 1 if <value> omitted)
 ! HELP-FC1-NEXT: -emit-obj Emit native object files
 ! HELP-FC1-NEXT: -E                     Only run the preprocessor
 ! HELP-FC1-NEXT: -falternative-parameter-statement
 ! HELP-FC1-NEXT: Enable the old style PARAMETER statement

flang/test/Driver/driver-version.f90

-! RUN: %flang-new --version 2>&1 | FileCheck %s
-! RUN: not %flang-new --versions 2>&1 | FileCheck %s --check-prefix=ERROR
-
 ! REQUIRES: new-flang-driver
 
+!-----------
+! RUN LINES
+!-----------
+! RUN: %flang --version 2>&1 | FileCheck %s
+! RUN: not %flang --versions 2>&1 | FileCheck %s --check-prefix=ERROR
+
+!-----------------------
+! EXPECTED OUTPUT
+!-----------------------
 ! CHECK: flang-new version
 ! CHECK-NEXT: Target:
 ! CHECK-NEXT: Thread model:
 ! CHECK-NEXT: InstalledDir:
 
 ! ERROR: flang-new: error: unsupported option '--versions'; did you mean '--version'?

flang/test/Driver/escaped-backslash.f90

 ! Ensure argument -fbackslash works as expected.
 
-! REQUIRES: new-flang-driver
-
 !--------------------------
 ! FLANG DRIVER (flang-new)
 !--------------------------
-! RUN: %flang-new -E %s  2>&1 | FileCheck %s --check-prefix=ESCAPED
-! RUN: %flang-new -E -fbackslash -fno-backslash %s  2>&1 | FileCheck %s --check-prefix=ESCAPED
-! RUN: %flang-new -E -fbackslash %s  2>&1 | FileCheck %s --check-prefix=UNESCAPED
+! RUN: %flang -E %s  2>&1 | FileCheck %s --check-prefix=ESCAPED
+! RUN: %flang -E -fbackslash -fno-backslash %s  2>&1 | FileCheck %s --check-prefix=ESCAPED
+! RUN: %flang -E -fbackslash %s  2>&1 | FileCheck %s --check-prefix=UNESCAPED
 
 !-----------------------------------------
 ! FRONTEND FLANG DRIVER (flang-new -fc1)
 !-----------------------------------------
-! RUN: %flang-new -fc1 -E %s  2>&1 | FileCheck %s --check-prefix=ESCAPED
-! RUN: %flang-new -fc1 -E -fbackslash -fno-backslash %s  2>&1 | FileCheck %s --check-prefix=ESCAPED
-! RUN: %flang-new -fc1 -E -fbackslash %s  2>&1 | FileCheck %s --check-prefix=UNESCAPED
+! RUN: %flang_fc1 -E %s  2>&1 | FileCheck %s --check-prefix=ESCAPED
+! RUN: %flang_fc1 -E -fbackslash -fno-backslash %s  2>&1 | FileCheck %s --check-prefix=ESCAPED
+! RUN: %flang_fc1 -E -fbackslash %s  2>&1 | FileCheck %s --check-prefix=UNESCAPED
 
 !-----------------------------------------
 ! EXPECTED OUTPUT FOR ESCAPED BACKSLASHES
 !-----------------------------------------
 ! ESCAPED:program backslash
 ! ESCAPED-NEXT:New\\nline
 ! ESCAPED-NOT:New\nline
 

flang/test/Driver/fixed-free-detection.f90

 ! Ensure the driver correctly switches between fixed and free form based on the file extension.
 ! This test exploits the fact that the preprocessor treats white-spaces differently for free
 ! and fixed form input files.
 
-! REQUIRES: new-flang-driver
-
 !--------------------------
-! FLANG DRIVER (flang-new)
+! FLANG DRIVER (flang)
 !--------------------------
-! RUN: %flang-new -E %S/Inputs/free-form-test.f90  2>&1 | FileCheck %s --check-prefix=FREEFORM
-! RUN: %flang-new -E %S/Inputs/fixed-form-test.f  2>&1 | FileCheck %s --check-prefix=FIXEDFORM
-! RUN: %flang-new -E %S/Inputs/free-form-test.f90 %S/Inputs/fixed-form-test.f  2>&1 | FileCheck %s --check-prefix=MULTIPLEFORMS
+! RUN: %flang -E %S/Inputs/free-form-test.f90  2>&1 | FileCheck %s --check-prefix=FREEFORM
+! RUN: %flang -E %S/Inputs/fixed-form-test.f  2>&1 | FileCheck %s --check-prefix=FIXEDFORM
+! RUN: %flang -E %S/Inputs/free-form-test.f90 %S/Inputs/fixed-form-test.f  2>&1 | FileCheck %s --check-prefix=MULTIPLEFORMS
 
 !-----------------------------------------
-! FRONTEND FLANG DRIVER (flang-new -fc1)
+! FRONTEND FLANG DRIVER (flang_fc1)
 !-----------------------------------------
-! RUN: %flang-new -fc1 -E %S/Inputs/free-form-test.f90  2>&1 | FileCheck %s --check-prefix=FREEFORM
-! RUN: %flang-new -fc1 -E %S/Inputs/fixed-form-test.f  2>&1 | FileCheck %s --check-prefix=FIXEDFORM
-! RUN: %flang-new -fc1 -E %S/Inputs/free-form-test.f90 %S/Inputs/fixed-form-test.f  2>&1 | FileCheck %s --check-prefix=MULTIPLEFORMS
+! RUN: %flang_fc1 -E %S/Inputs/free-form-test.f90  2>&1 | FileCheck %s --check-prefix=FREEFORM
+! RUN: %flang_fc1 -E %S/Inputs/fixed-form-test.f  2>&1 | FileCheck %s --check-prefix=FIXEDFORM
+! RUN: %flang_fc1 -E %S/Inputs/free-form-test.f90 %S/Inputs/fixed-form-test.f  2>&1 | FileCheck %s --check-prefix=MULTIPLEFORMS
 
 !-------------------------------------
 ! EXPECTED OUTPUT FOR A FREE FORM FILE
 !-------------------------------------
 ! FREEFORM:program freeform
 ! FREEFORM-NOT:programfixedform
 
 !---------------------------------------

flang/test/Driver/fixed-free-flag.f90

 ! Ensure arguments -ffree-form and -ffixed-form work as expected.
 
-! REQUIRES: new-flang-driver
-
 !--------------------------
-! FLANG DRIVER (flang-new)
+! FLANG DRIVER (flang)
 !--------------------------
-! RUN: not %flang-new -fsyntax-only -ffree-form %S/Inputs/fixed-form-test.f  2>&1 | FileCheck %s --check-prefix=FREEFORM
-! RUN: %flang-new -fsyntax-only -ffixed-form %S/Inputs/free-form-test.f90 2>&1 | FileCheck %s --check-prefix=FIXEDFORM
+! RUN: not %flang -fsyntax-only -ffree-form %S/Inputs/fixed-form-test.f  2>&1 | FileCheck %s --check-prefix=FREEFORM
+! RUN: %flang -fsyntax-only -ffixed-form %S/Inputs/free-form-test.f90 2>&1 | FileCheck %s --check-prefix=FIXEDFORM
 
 !----------------------------------------
-! FRONTEND FLANG DRIVER (flang-new -fc1)
+! FRONTEND FLANG DRIVER (flang -fc1)
 !----------------------------------------
-! RUN: not %flang-new -fc1 -fsyntax-only -ffree-form %S/Inputs/fixed-form-test.f  2>&1 | FileCheck %s --check-prefix=FREEFORM
-! RUN: %flang-new -fc1 -fsyntax-only -ffixed-form %S/Inputs/free-form-test.f90 2>&1 | FileCheck %s --check-prefix=FIXEDFORM
+! RUN: not %flang_fc1 -fsyntax-only -ffree-form %S/Inputs/fixed-form-test.f  2>&1 | FileCheck %s --check-prefix=FREEFORM
+! RUN: %flang_fc1 -fsyntax-only -ffixed-form %S/Inputs/free-form-test.f90 2>&1 | FileCheck %s --check-prefix=FIXEDFORM
 
 !------------------------------------
 ! EXPECTED OUTPUT FOR FREE FORM MODE
 !------------------------------------
-! FREEFORM:error: Could not parse
+! FREEFORM: Could not parse
 
 !-------------------------------------
 ! EXPECTED OUTPUT FOR FIXED FORM MODE
 !-------------------------------------
 ! FIXEDFORM:free-form-test.f90:1:1: Character in fixed-form label field must be a digit

flang/test/Driver/fixed-line-length.f90

 ! Ensure argument -ffixed-line-length=n works as expected.
 
 ! REQUIRES: new-flang-driver
 
 !--------------------------
-! FLANG DRIVER (flang-new)
+! FLANG DRIVER (flang)
 !--------------------------
-! RUN: %flang-new -E %S/Inputs/fixed-line-length-test.f  2>&1 | FileCheck %s --check-prefix=DEFAULTLENGTH
-! RUN: not %flang-new -E -ffixed-line-length=-2 %S/Inputs/fixed-line-length-test.f  2>&1 | FileCheck %s --check-prefix=NEGATIVELENGTH
-! RUN: not %flang-new -E -ffixed-line-length=3 %S/Inputs/fixed-line-length-test.f  2>&1 | FileCheck %s --check-prefix=INVALIDLENGTH
-! RUN: %flang-new -E -ffixed-line-length=none %S/Inputs/fixed-line-length-test.f  2>&1 | FileCheck %s --check-prefix=UNLIMITEDLENGTH
-! RUN: %flang-new -E -ffixed-line-length=0 %S/Inputs/fixed-line-length-test.f  2>&1 | FileCheck %s --check-prefix=UNLIMITEDLENGTH
-! RUN: %flang-new -E -ffixed-line-length=13 %S/Inputs/fixed-line-length-test.f  2>&1 | FileCheck %s --check-prefix=LENGTH13
+! RUN: %flang -E %S/Inputs/fixed-line-length-test.f  2>&1 | FileCheck %s --check-prefix=DEFAULTLENGTH
+! RUN: not %flang -E -ffixed-line-length=-2 %S/Inputs/fixed-line-length-test.f  2>&1 | FileCheck %s --check-prefix=NEGATIVELENGTH
+! RUN: not %flang -E -ffixed-line-length=3 %S/Inputs/fixed-line-length-test.f  2>&1 | FileCheck %s --check-prefix=INVALIDLENGTH
+! RUN: %flang -E -ffixed-line-length=none %S/Inputs/fixed-line-length-test.f  2>&1 | FileCheck %s --check-prefix=UNLIMITEDLENGTH
+! RUN: %flang -E -ffixed-line-length=0 %S/Inputs/fixed-line-length-test.f  2>&1 | FileCheck %s --check-prefix=UNLIMITEDLENGTH
+! RUN: %flang -E -ffixed-line-length=13 %S/Inputs/fixed-line-length-test.f  2>&1 | FileCheck %s --check-prefix=LENGTH13
 
 !----------------------------------------
-! FRONTEND FLANG DRIVER (flang-new -fc1)
+! FRONTEND FLANG DRIVER (flang -fc1)
 !----------------------------------------
-! RUN: %flang-new -fc1 -E %S/Inputs/fixed-line-length-test.f  2>&1 | FileCheck %s --check-prefix=DEFAULTLENGTH
-! RUN: not %flang-new -fc1 -E -ffixed-line-length=-2 %S/Inputs/fixed-line-length-test.f  2>&1 | FileCheck %s --check-prefix=NEGATIVELENGTH
-! RUN: not %flang-new -fc1 -E -ffixed-line-length=3 %S/Inputs/fixed-line-length-test.f  2>&1 | FileCheck %s --check-prefix=INVALIDLENGTH
-! RUN: %flang-new -fc1 -E -ffixed-line-length=none %S/Inputs/fixed-line-length-test.f  2>&1 | FileCheck %s --check-prefix=UNLIMITEDLENGTH
-! RUN: %flang-new -fc1 -E -ffixed-line-length=0 %S/Inputs/fixed-line-length-test.f  2>&1 | FileCheck %s --check-prefix=UNLIMITEDLENGTH
-! RUN: %flang-new -fc1 -E -ffixed-line-length=13 %S/Inputs/fixed-line-length-test.f  2>&1 | FileCheck %s --check-prefix=LENGTH13
+! RUN: %flang_fc1 -E %S/Inputs/fixed-line-length-test.f  2>&1 | FileCheck %s --check-prefix=DEFAULTLENGTH
+! RUN: not %flang_fc1 -E -ffixed-line-length=-2 %S/Inputs/fixed-line-length-test.f  2>&1 | FileCheck %s --check-prefix=NEGATIVELENGTH
+! RUN: not %flang_fc1 -E -ffixed-line-length=3 %S/Inputs/fixed-line-length-test.f  2>&1 | FileCheck %s --check-prefix=INVALIDLENGTH
+! RUN: %flang_fc1 -E -ffixed-line-length=none %S/Inputs/fixed-line-length-test.f  2>&1 | FileCheck %s --check-prefix=UNLIMITEDLENGTH
+! RUN: %flang_fc1 -E -ffixed-line-length=0 %S/Inputs/fixed-line-length-test.f  2>&1 | FileCheck %s --check-prefix=UNLIMITEDLENGTH
+! RUN: %flang_fc1 -E -ffixed-line-length=13 %S/Inputs/fixed-line-length-test.f  2>&1 | FileCheck %s --check-prefix=LENGTH13
 
 !-------------------------------------
 ! COMMAND ALIAS -ffixed-line-length-n
 !-------------------------------------
-! RUN: %flang-new -E -ffixed-line-length-13 %S/Inputs/fixed-line-length-test.f  2>&1 | FileCheck %s --check-prefix=LENGTH13
-! RUN: %flang-new -fc1 -E -ffixed-line-length-13 %S/Inputs/fixed-line-length-test.f  2>&1 | FileCheck %s --check-prefix=LENGTH13
+! RUN: %flang -E -ffixed-line-length-13 %S/Inputs/fixed-line-length-test.f  2>&1 | FileCheck %s --check-prefix=LENGTH13
+! RUN: %flang_fc1 -E -ffixed-line-length-13 %S/Inputs/fixed-line-length-test.f  2>&1 | FileCheck %s --check-prefix=LENGTH13
 
 !-------------------------------------
 ! EXPECTED OUTPUT WITH DEFAULT LENGTH
 !-------------------------------------
 ! The line should be trimmed to 72 characters when reading based on the default value of fixed line length.
 ! DEFAULTLENGTH: program{{(a{58})}}
 
 !-----------------------------------------

flang/test/Driver/frontend-forwarding.f90

 ! Test that flang-new forwards Flang frontend
 ! options to flang-new -fc1 as expected.
 
 ! REQUIRES: new-flang-driver
 
-! RUN: %flang-new -fsyntax-only -### %s -o %t 2>&1 \
+! RUN: %flang -fsyntax-only -### %s -o %t 2>&1 \
 ! RUN:     -finput-charset=utf-8 \
 ! RUN:     -fdefault-double-8 \
 ! RUN:     -fdefault-integer-8 \
 ! RUN:     -fdefault-real-8 \
 ! RUN:     -flarge-sizes \
 ! RUN:   | FileCheck %s
 
 ! CHECK: "-finput-charset=utf-8"
 ! CHECK: "-fdefault-double-8"
 ! CHECK: "-fdefault-integer-8"
 ! CHECK: "-fdefault-real-8"
 ! CHECK: "-flarge-sizes"

flang/test/Driver/implicit-none.f90

 ! Ensure argument -fimplicit-none works as expected.
 
-! REQUIRES: new-flang-driver
-
 !--------------------------
-! FLANG DRIVER (flang-new)
+! FLANG DRIVER (flang)
 !--------------------------
-! RUN: %flang-new -fsyntax-only %s  2>&1 | FileCheck %s --allow-empty --check-prefix=DEFAULT
-! RUN: %flang-new -fsyntax-only -fimplicit-none -fno-implicit-none %s  2>&1 | FileCheck %s --allow-empty --check-prefix=DEFAULT
-! RUN: not %flang-new -fsyntax-only -fimplicit-none %s  2>&1 | FileCheck %s --check-prefix=WITH_IMPL_NONE
+! RUN: %flang -fsyntax-only %s  2>&1 | FileCheck %s --allow-empty --check-prefix=DEFAULT
+! RUN: %flang -fsyntax-only -fimplicit-none -fno-implicit-none %s  2>&1 | FileCheck %s --allow-empty --check-prefix=DEFAULT
+! RUN: not %flang -fsyntax-only -fimplicit-none %s  2>&1 | FileCheck %s --check-prefix=WITH_IMPL_NONE
 
 !-----------------------------------------
-! FRONTEND FLANG DRIVER (flang-new -fc1)
+! FRONTEND FLANG DRIVER (flang_fc1)
 !-----------------------------------------
-! RUN: %flang-new -fc1 -fsyntax-only %s  2>&1 | FileCheck %s --allow-empty --check-prefix=DEFAULT
-! RUN: %flang-new -fc1 -fsyntax-only -fimplicit-none -fno-implicit-none %s  2>&1 | FileCheck %s --allow-empty --check-prefix=DEFAULT
-! RUN: not %flang-new -fc1 -fsyntax-only -fimplicit-none %s  2>&1 | FileCheck %s --check-prefix=WITH_IMPL_NONE
+! RUN: %flang_fc1 -fsyntax-only %s  2>&1 | FileCheck %s --allow-empty --check-prefix=DEFAULT
+! RUN: %flang_fc1 -fsyntax-only -fimplicit-none -fno-implicit-none %s  2>&1 | FileCheck %s --allow-empty --check-prefix=DEFAULT
+! RUN: not %flang_fc1 -fsyntax-only -fimplicit-none %s  2>&1 | FileCheck %s --check-prefix=WITH_IMPL_NONE
 
 !--------------------------------------
 ! EXPECTED OUTPUT FOR NO IMPLICIT NONE
 !--------------------------------------
 ! DEFAULT-NOT:error
 
 !------------------------------------------
 ! EXPECTED OUTPUT FOR IMPLICIT NONE ALWAYS
 !------------------------------------------
 ! WITH_IMPL_NONE:No explicit type declared for 'a'
 ! WITH_IMPL_NONE:No explicit type declared for 'b'
 
 function a()
   a = b
 end

flang/test/Driver/include-header.f90

 ! Ensure argument -I works as expected with an included header.
 
-! REQUIRES: new-flang-driver
-
 !--------------------------
-! FLANG DRIVER (flang-new)
+! FLANG DRIVER (flang)
 !--------------------------
-! RUN: not %flang-new -E %s  2>&1 | FileCheck %s --check-prefix=UNINCLUDED
-! RUN: %flang-new -E -I %S/Inputs %s  2>&1 | FileCheck %s --check-prefix=SINGLEINCLUDE
-! RUN: %flang-new -E -I %S/Inputs -I %S/Inputs/header-dir %s  2>&1 | FileCheck %s --check-prefix=MAINDIRECTORY
-! RUN: %flang-new -E -I %S/Inputs/header-dir -I %S/Inputs %s  2>&1 | FileCheck %s --check-prefix=SUBDIRECTORY
+! RUN: not %flang -E %s  2>&1 | FileCheck %s --check-prefix=UNINCLUDED
+! RUN: %flang -E -I %S/Inputs %s  2>&1 | FileCheck %s --check-prefix=SINGLEINCLUDE
+! RUN: %flang -E -I %S/Inputs -I %S/Inputs/header-dir %s  2>&1 | FileCheck %s --check-prefix=MAINDIRECTORY
+! RUN: %flang -E -I %S/Inputs/header-dir -I %S/Inputs %s  2>&1 | FileCheck %s --check-prefix=SUBDIRECTORY
 
 !----------------------------------------
-! FRONTEND FLANG DRIVER (flang-new -fc1)
+! FRONTEND FLANG DRIVER (flang_fc1)
 !----------------------------------------
-! RUN: not %flang-new -fc1 -E %s  2>&1 | FileCheck %s --check-prefix=UNINCLUDED
-! RUN: %flang-new -fc1 -E -I %S/Inputs %s  2>&1 | FileCheck %s --check-prefix=SINGLEINCLUDE
-! RUN: %flang-new -fc1 -E -I %S/Inputs -I %S/Inputs/header-dir %s  2>&1 | FileCheck %s --check-prefix=MAINDIRECTORY
-! RUN: %flang-new -fc1 -E -I %S/Inputs/header-dir -I %S/Inputs %s  2>&1 | FileCheck %s --check-prefix=SUBDIRECTORY
+! RUN: not %flang_fc1 -E %s  2>&1 | FileCheck %s --check-prefix=UNINCLUDED
+! RUN: %flang_fc1 -E -I %S/Inputs %s  2>&1 | FileCheck %s --check-prefix=SINGLEINCLUDE
+! RUN: %flang_fc1 -E -I %S/Inputs -I %S/Inputs/header-dir %s  2>&1 | FileCheck %s --check-prefix=MAINDIRECTORY
+! RUN: %flang_fc1 -E -I %S/Inputs/header-dir -I %S/Inputs %s  2>&1 | FileCheck %s --check-prefix=SUBDIRECTORY
 
 !--------------------------------------------
 ! EXPECTED OUTPUT FOR MISSING INCLUDED FILE
 !--------------------------------------------
 ! UNINCLUDED:#include: Source file 'basic-header-one.h' was not found
 ! UNINCLUDED-NOT:program b
 ! UNINCLUDED-NOT:program c
 

flang/test/Driver/macro-multiline.F90

 ! Ensure the end-of-line character and anything that follows after in a macro definition (-D) is ignored.
 
 ! REQUIRES: new-flang-driver
 
 !--------------------------
-! FLANG DRIVER (flang-new)
+! FLANG DRIVER (flang)
 !--------------------------
-! RUN: printf -- "-DX=A\\\\\nTHIS_SHOULD_NOT_EXIST_IN_THE_OUTPUT\n" | xargs %flang-new -E %s  2>&1 | FileCheck --strict-whitespace --match-full-lines %s
+! RUN: printf -- "-DX=A\\\\\nTHIS_SHOULD_NOT_EXIST_IN_THE_OUTPUT\n" | xargs %flang -E %s  2>&1 | FileCheck --strict-whitespace --match-full-lines %s
 
 !-----------------------------------------
-! FRONTEND FLANG DRIVER (flang-new -fc1)
+! FRONTEND FLANG DRIVER (flang_fc1)
 !-----------------------------------------
-! RUN: printf -- "-DX=A\\\\\nTHIS_SHOULD_NOT_EXIST_IN_THE_OUTPUT\n" | xargs %flang-new -fc1 -E %s  2>&1 | FileCheck --strict-whitespace --match-full-lines %s
+! RUN: printf -- "-DX=A\\\\\nTHIS_SHOULD_NOT_EXIST_IN_THE_OUTPUT\n" | xargs %flang_fc1 -E %s  2>&1 | FileCheck --strict-whitespace --match-full-lines %s
 
 !-------------------------------
 ! EXPECTED OUTPUT FOR MACRO 'X'
 !-------------------------------
 ! CHECK:start a end
 ! CHECK-NOT:THIS_SHOULD_NOT_EXIST_IN_THE_OUTPUT
 ! CHECK-NOT:this_should_not_exist_in_the_output
 
-START X END
+START X END
 

flang/test/Driver/missing-input.f90

-! REQUIRES: new-flang-driver
-
 ! Test the behaviour of the driver when input is missing or is invalid. Note
 ! that with the compiler driver (flang-new), the input _has_ to be specified.
 ! Indeed, the driver decides what "job/command" to create based on the input
 ! file's extension. No input file means that it doesn't know what to do
 ! (compile?  preprocess? link?). The frontend driver (flang-new -fc1) simply
 ! assumes that "no explicit input == read from stdin"
 
+! REQUIRES: new-flang-driver
+
 !--------------------------
 ! FLANG DRIVER (flang-new)
 !--------------------------
-! RUN: not %flang-new  2>&1 | FileCheck %s --check-prefix=FLANG-NO-FILE
-! RUN: not %flang-new %t 2>&1 | FileCheck %s --check-prefix=FLANG-NONEXISTENT-FILE
+! RUN: not %flang  2>&1 | FileCheck %s --check-prefix=FLANG-NO-FILE
+! RUN: not %flang %t 2>&1 | FileCheck %s --check-prefix=FLANG-NONEXISTENT-FILE
 
 !-----------------------------------------
 ! FLANG FRONTEND DRIVER (flang-new -fc1)
 !-----------------------------------------
-! RUN: not %flang-new -fc1 %t 2>&1  | FileCheck %s --check-prefix=FLANG-FC1-NONEXISTENT-FILE
-! RUN: not %flang-new -fc1 %S 2>&1  | FileCheck %s --check-prefix=FLANG-FC1-DIR
+! RUN: not %flang_fc1 %t 2>&1  | FileCheck %s --check-prefix=FLANG-FC1-NONEXISTENT-FILE
+! RUN: not %flang_fc1 %S 2>&1  | FileCheck %s --check-prefix=FLANG-FC1-DIR
 
 !-----------------------
 ! EXPECTED OUTPUT
 !-----------------------
 ! FLANG-NO-FILE: flang-new: error: no input files
 
 ! FLANG-NONEXISTENT-FILE: flang-new: error: no such file or directory: {{.*}}
 ! FLANG-NONEXISTENT-FILE: flang-new: error: no input files
 
 ! FLANG-FC1-NONEXISTENT-FILE: error: {{.*}} does not exist
 ! FLANG-FC1-DIR: error: {{.*}} is not a regular file

flang/test/Driver/parse-error.f95

-! RUN: not %flang-new -fc1 -fsyntax-only %s 2>&1 | FileCheck %s --check-prefix=ERROR
-! RUN: not %f18 -syntax-only %s 2>&1 | FileCheck %s --check-prefix=ERROR
+! Verify that parsing errors are correctly reported by the driver
 
-! REQUIRES: new-flang-driver
+! RUN: not %flang_fc1 -fsyntax-only %s 2>&1 | FileCheck %s --check-prefix=ERROR
 
 ! ERROR: Could not parse {{.*}}parse-error.f95
 
 "This file will not parse"

flang/test/Driver/phases.f90

-! RUN: %flang-new -E -ccc-print-phases %s 2>&1 | FileCheck %s --check-prefix=PP
-! RUN: %flang-new -fsyntax-only -ccc-print-phases %s 2>&1 | FileCheck %s --check-prefix=COMPILE
-! RUN: %flang-new -c -ccc-print-phases %s 2>&1 | FileCheck %s --check-prefix=EMIT_OBJ
+! This test verifies the phase control in Flang compiler driver.
 
 ! REQUIRES: new-flang-driver
 
-! This test verifies the phase control in Flang compiler driver.
+!-----------
+! RUN LINES
+!-----------
+! RUN: %flang -E -ccc-print-phases %s 2>&1 | FileCheck %s --check-prefix=PP
+! RUN: %flang -fsyntax-only -ccc-print-phases %s 2>&1 | FileCheck %s --check-prefix=COMPILE
+! RUN: %flang -c -ccc-print-phases %s 2>&1 | FileCheck %s --check-prefix=EMIT_OBJ
 
+!-----------------------
+! EXPECTED OUTPUT
+!-----------------------
 ! PP: +- 0: input, "{{.*}}phases.f90", f95-cpp-input
 ! PP-NEXT: 1: preprocessor, {0}, f95
 
 ! COMPILE: +- 0: input, "{{.*}}phases.f90", f95-cpp-input
 ! COMPILE-NEXT: 1: preprocessor, {0}, f95
 ! COMPILE-NEXT: 2: compiler, {1}, none
 
 ! EMIT_OBJ: +- 0: input, "{{.*}}phases.f90", f95-cpp-input
 ! EMIT_OBJ-NEXT: 1: preprocessor, {0}, f95
 ! EMIT_OBJ-NEXT: 2: compiler, {1}, ir
 ! EMIT_OBJ-NEXT: +- 3: backend, {2}, assembler
 ! EMIT_OBJ-NEXT: 4: assembler, {3}, object

flang/test/Driver/scanning-error.f95

-! RUN: not %flang-new -fc1 -E %s 2>&1 | FileCheck %s --check-prefix=ERROR
-! RUN: not %f18 -E %s 2>&1 | FileCheck %s --check-prefix=ERROR
-
-! REQUIRES: new-flang-driver
+! RUN: not %flang_fc1 -E %s 2>&1 | FileCheck %s --check-prefix=ERROR
 
 ! ERROR: Could not scan {{.*}}scanning-error.f95
 
 #NOT-PP-DIRECTIVE

flang/test/Driver/syntax-only.f90

-! RUN: not %flang-new -fc1 -fsyntax-only %s 2>&1 | FileCheck %s
-! RUN: not %f18 -fsyntax-only %s 2>&1 | FileCheck %s
+! Verify that the compiler driver correctly processes `-fsyntax-only`. By
+! default it will try to run code-generation, but that's not supported yet. We
+! don't need to test the frontend driver here - it runs `-fsyntax-only` by
+! default.
 
 ! REQUIRES: new-flang-driver
 
-! CHECK: IF statement is not allowed in IF statement
-! CHECK: Semantic errors in {{.*}}syntax-only.f90
+!-----------
+! RUN LINES
+!-----------
+! RUN: not %flang -fsyntax-only %s 2>&1 | FileCheck %s --check-prefix=FSYNTAX_ONLY
+! RUN: not %flang  %s 2>&1 | FileCheck %s --check-prefix=NO_FSYNTAX_ONLY
+
+!-----------------
+! EXPECTED OUTPUT
+!-----------------
+! FSYNTAX_ONLY: IF statement is not allowed in IF statement
+! FSYNTAX_ONLY_NEXT: Semantic errors in {{.*}}syntax-only.f90
+
+! NO_FSYNTAX_ONLY: error: code-generation is not available yet
+
+!-------
+! INPUT
+!-------
 IF (A > 0.0) IF (B < 0.0) A = LOG (A)
 END

flang/test/Frontend/Inputs/hello-world.c

-int main() { return 0; }

flang/test/Frontend/input-output-file.f90

 ! REQUIRES: new-flang-driver
 
 !--------------------------
-! FLANG DRIVER (flang-new)
+! FLANG DRIVER (flang)
 !--------------------------
 ! NOTE: Use `-E` so that the compiler driver stops after the 1st compilation phase, preprocessing. That's all we need.
 
 ! TEST 1: Print to stdout (implicit)
-! RUN: %flang-new -E -Xflang -test-io %s  2>&1 | FileCheck %s --match-full-lines
+! RUN: %flang -E -Xflang -test-io %s  2>&1 | FileCheck %s --match-full-lines
 
 ! TEST 2: Print to stdout (explicit)
-! RUN: %flang-new -E -Xflang -test-io -o - %s  2>&1 | FileCheck %s --match-full-lines
+! RUN: %flang -E -Xflang -test-io -o - %s  2>&1 | FileCheck %s --match-full-lines
 
 ! TEST 3: Print to a file
-! RUN: %flang-new -E -Xflang -test-io -o %t %s 2>&1 && FileCheck %s --match-full-lines --input-file=%t
+! RUN: %flang -E -Xflang -test-io -o %t %s 2>&1 && FileCheck %s --match-full-lines --input-file=%t
 
 !----------------------------------------
-! FLANG FRONTEND DRIVER (flang-new -fc1)
+! FLANG FRONTEND DRIVER (flang -fc1)
 !----------------------------------------
 ! TEST 4: Write to a file (implicit)
 ! This particular test case generates an output file in the same directory as the input file. We need to copy the input file into a
 ! temporary directory to avoid polluting the source directory.
 ! RUN: rm -rf %t-dir && mkdir -p %t-dir && cd %t-dir
 ! RUN: cp %s .
-! RUN: %flang-new -fc1 -test-io input-output-file.f90  2>&1 && FileCheck %s --match-full-lines --input-file=input-output-file.txt
+! RUN: %flang_fc1 -test-io input-output-file.f90  2>&1 && FileCheck %s --match-full-lines --input-file=input-output-file.txt
 
 ! TEST 5: Write to a file (explicit)
-! RUN: %flang-new -fc1 -test-io  -o %t %s 2>&1 && FileCheck %s --match-full-lines --input-file=%t
+! RUN: %flang_fc1 -test-io  -o %t %s 2>&1 && FileCheck %s --match-full-lines --input-file=%t
 
 !-----------------------
 ! EXPECTED OUTPUT
 !-----------------------
 ! CHECK-LABEL: Program arithmetic
 ! CHECK-NEXT:    Integer :: i, j
 ! CHECK-NEXT:    i = 2; j = 3; i= i * j;
 ! CHECK-NEXT:  End Program arithmetic
 
 Program arithmetic
   Integer :: i, j
   i = 2; j = 3; i= i * j;
 End Program arithmetic

flang/test/Frontend/multiple-input-files.f90

 ! REQUIRES: new-flang-driver
 
 !--------------------------
-! FLANG DRIVER (flang-new)
+! FLANG DRIVER (flang)
 !--------------------------
 ! NOTE: Use `-E` so that the compiler driver stops after the 1st compilation phase, preprocessing. That's all we need.
 
 ! TEST 1: Both input files are processed (output is printed to stdout)
-! RUN: %flang-new -E -Xflang -test-io %s %S/Inputs/hello-world.f90 | FileCheck %s --match-full-lines -check-prefix=FLANG
+! RUN: %flang -E -Xflang -test-io %s %S/Inputs/hello-world.f90 | FileCheck %s --match-full-lines -check-prefix=FLANG
 
 ! TEST 2: None of the files is processed (not possible to specify the output file when multiple input files are present)
-! RUN: not %flang-new -E -Xflang -test-io -o - %S/Inputs/hello-world.f90 %s  2>&1 | FileCheck %s --match-full-lines -check-prefix=ERROR
-! RUN: not %flang-new -E -Xflang -test-io -o %t %S/Inputs/hello-world.f90 %s 2>&1 | FileCheck %s --match-full-lines -check-prefix=ERROR
+! RUN: not %flang -E -Xflang -test-io -o - %S/Inputs/hello-world.f90 %s  2>&1 | FileCheck %s --match-full-lines -check-prefix=ERROR
+! RUN: not %flang -E -Xflang -test-io -o %t %S/Inputs/hello-world.f90 %s 2>&1 | FileCheck %s --match-full-lines -check-prefix=ERROR
 
 !----------------------------------------
-! FLANG FRONTEND DRIVER (flang-new -fc1)
+! FLANG FRONTEND DRIVER (flang -fc1)
 !----------------------------------------
 ! TEST 3: Both input files are processed
 ! This particular test case generates output files in the same directory as the input files. We need to copy the input files into a
 ! temporary directory to avoid polluting the source directory.
 ! RUN: rm -rf %t-dir && mkdir -p %t-dir && cd %t-dir
 ! RUN: cp %s . && cp %S/Inputs/hello-world.f90 .
-! RUN: %flang-new -fc1 -test-io  hello-world.f90 multiple-input-files.f90 2>&1 \
+! RUN: %flang_fc1 -test-io  hello-world.f90 multiple-input-files.f90 2>&1 \
 ! RUN:  && FileCheck %s --input-file=multiple-input-files.txt --match-full-lines -check-prefix=FC1-OUTPUT1 \
 ! RUN:  && FileCheck %s --input-file=hello-world.txt --match-full-lines -check-prefix=FC1-OUTPUT2
 
 ! TEST 4: Only the last input file is processed
-! RUN: %flang-new -fc1 -test-io %s %S/Inputs/hello-world.f90 -o %t 2>&1 \
+! RUN: %flang_fc1 -test-io %s %S/Inputs/hello-world.f90 -o %t 2>&1 \
 ! RUN:  && FileCheck %s --input-file=%t --match-full-lines -check-prefix=FC1-OUTPUT3
 
 !-----------------------
 ! EXPECTED OUTPUT
 !-----------------------
-! TEST 1: By default, `flang-new` prints the output from all input files to
+! TEST 1: By default, `flang` prints the output from all input files to
 ! stdout
 ! FLANG-LABEL: Program arithmetic
 ! FLANG-NEXT:    Integer :: i, j
 ! FLANG-NEXT:    i = 2; j = 3; i= i * j;
 ! FLANG-NEXT:  End Program arithmetic
 ! FLANG-NEXT:!This is a test file with a hello world in Fortran
 ! FLANG-NEXT:program hello
 ! FLANG-NEXT:  implicit none
 ! FLANG-NEXT:  write(*,*) 'Hello world!'
 ! FLANG-NEXT:end program hello
 
-! TEST 2: `-o` does not work for `flang-new` when multiple input files are present
+! TEST 2: `-o` does not work for `flang` when multiple input files are present
 ! ERROR: flang-new: error: cannot specify -o when generating multiple output files
 
-! TEST 3: The output file _was not_ specified - `flang-new -fc1` will process all
+! TEST 3: The output file _was not_ specified - `flang_fc1` will process all
 ! input files and generate one output file for every input file.
 ! FC1-OUTPUT1-LABEL: Program arithmetic
 ! FC1-OUTPUT1-NEXT:    Integer :: i, j
 ! FC1-OUTPUT1-NEXT:    i = 2; j = 3; i= i * j;
 ! FC1-OUTPUT1-NEXT:  End Program arithmetic
 
 ! FC1-OUTPUT2-LABEL:!This is a test file with a hello world in Fortran
 ! FC1-OUTPUT2-NEXT:program hello
 ! FC1-OUTPUT2-NEXT:  implicit none
 ! FC1-OUTPUT2-NEXT:  write(*,*) 'Hello world!'
 ! FC1-OUTPUT2-NEXT:end program hello
 
-! TEST 4: The output file _was_ specified - `flang-new -fc1` will process only
+! TEST 4: The output file _was_ specified - `flang_fc1` will process only
 ! the last input file and generate the corresponding output.
 ! FC1-OUTPUT3-LABEL:!This is a test file with a hello world in Fortran
 ! FC1-OUTPUT3-NEXT:program hello
 ! FC1-OUTPUT3-NEXT:  implicit none
 ! FC1-OUTPUT3-NEXT:  write(*,*) 'Hello world!'
 ! FC1-OUTPUT3-NEXT:end program hello
 
 
 Program arithmetic
   Integer :: i, j
   i = 2; j = 3; i= i * j;
 End Program arithmetic

flang/test/Frontend/prescanner-diag.f90

-! Test that the driver correctly reports diagnostics from the prescanner. The contents of the include file are irrelevant here.
+! Test that the driver correctly reports diagnostics from the prescanner, no
+! matter what driver action/phase is run. We need this test as Flang currently
+! has no central API for managing the diagnostics. For this reason the driver
+! needs to make sure that the diagnostics are indeed issued (rather that relying
+! on some DiagnosticsEngine).
 
+!-----------
+! RUN LINES
+!-----------
 ! Test with -E (i.e. PrintPreprocessedAction, stops after prescanning)
 ! RUN: %flang -E -I %S/Inputs/ %s 2>&1 | FileCheck %s
 ! RUN: %flang_fc1 -E -I %S/Inputs/ %s 2>&1 | FileCheck %s
 
 ! Test with -fsyntax-only (i.e. ParseSyntaxOnlyAction, stops after semantic checks)
 ! RUN: %flang -fsyntax-only -I %S/Inputs/ %s 2>&1 | FileCheck %s
 ! RUN: %flang_fc1 -fsyntax-only -I %S/Inputs/ %s 2>&1 | FileCheck %s
 
-! CHECK: prescanner-diag.f90:12:20: #include: extra stuff ignored after file name
+!-----------------------
+! EXPECTED OUTPUT
+!-----------------------
+! CHECK: prescanner-diag.f90:27:20: #include: extra stuff ignored after file name
+! CHECK: prescanner-diag.f90:28:20: #include: extra stuff ignored after file name
+
+!-------
+! INPUT
+!-------
 #include <empty.h> comment
-! CHECK: prescanner-diag.f90:14:20: #include: extra stuff ignored after file name
 #include "empty.h" comment
 end

flang/test/Frontend/print-preprocess-C-file.f90

-! Test preprocessing for C files using Flang driver
-
-! REQUIRES: new-flang-driver
-
-!--------------------------
-! FLANG DRIVER (flang-new)
-!--------------------------
-! RUN: not %flang-new -E %S/Inputs/hello-world.c  2>&1 | FileCheck %s
-
-!-----------------------
-! EXPECTED OUTPUT
-!-----------------------
-! CHECK: error: unknown integrated tool '-cc1'. Valid tools include '-fc1'.

flang/test/Frontend/print-preprocessed-file.f90

-! Test printpreprocessed action
-
-! REQUIRES: new-flang-driver
-
-!--------------------------
-! FLANG DRIVER (flang-new)
-!--------------------------
-! RUN: %flang-new -E %s  2>&1 | FileCheck %s
-
-!-----------------------------------------
-! FRONTEND FLANG DRIVER (flang-new -fc1)
-!-----------------------------------------
-! RUN: %flang-new -fc1 -E %s  2>&1 | FileCheck %s
-
-!-----------------------
-! EXPECTED OUTPUT
-!-----------------------
-! CHECK:program a
-! CHECK-NOT:program b
-! CHECK-NEXT:x = 1
-! CHECK-NEXT:write(*,*) x
-! CHECK-NEXT:end
-
-! Preprocessed-file.F:
-#define NEW
-#ifdef NEW
-  program A
-#else
-  program B
-#endif
-    x = 1
-    write(*,*) x
-  end

flang/test/lit.cfg.py

 # For each occurrence of a flang tool name, replace it with the full path to
 # the build directory holding that tool.
 tools = [
   ToolSubst('%f18', command=FindTool('f18'),
     unresolved='fatal')
 ]
 
 if config.include_flang_new_driver_test:
-   tools.append(ToolSubst('%flang-new', command=FindTool('flang-new'), unresolved='fatal'))
    tools.append(ToolSubst('%flang', command=FindTool('flang-new'), unresolved='fatal'))
    tools.append(ToolSubst('%flang_fc1', command=FindTool('flang-new'),
     extra_args=['-fc1'], unresolved='fatal'))
 else:
    tools.append(ToolSubst('%flang', command=FindTool('f18'),
     unresolved='fatal'))
    tools.append(ToolSubst('%flang_fc1', command=FindTool('f18'),
     unresolved='fatal'))

flang/tools/f18/f18.cpp

while (!args.empty()) {
     } else if (arg == "-fxor-operator" || arg == "-fno-xor-operator") {
       options.features.Enable(Fortran::common::LanguageFeature::XOROperator,
           arg == "-fxor-operator");
     } else if (arg == "-flogical-abbreviations" ||
         arg == "-fno-logical-abbreviations") {
       options.features.Enable(
           Fortran::parser::LanguageFeature::LogicalAbbreviations,
           arg == "-flogical-abbreviations");
-    } else if (arg == "-fimplicit-none-type-always") {
+    } else if (arg == "-fimplicit-none-type-always" ||
+        arg == "-fimplicit-none") {
       options.features.Enable(
           Fortran::common::LanguageFeature::ImplicitNoneTypeAlways);
+    } else if (arg == "-fno-implicit-none") {
+      options.features.Enable(
+          Fortran::common::LanguageFeature::ImplicitNoneTypeAlways, false);
     } else if (arg == "-fimplicit-none-type-never") {
       options.features.Enable(
           Fortran::common::LanguageFeature::ImplicitNoneTypeNever);
     } else if (arg == "-falternative-parameter-statement") {
       options.features.Enable(
           Fortran::common::LanguageFeature::OldStyleParameter, true);
     } else if (arg == "-fdebug-dump-provenance") {
       driver.dumpProvenance = true;