[flang][nfc] Remove flang-new-driver from LIT

banach-space · banach-space · commit 5437f2e9a98b · 2021-08-13T08:17:40.000Z
After merging https://reviews.llvm.org/D105811, `flang-new-driver` is no longer required. Differential Revision: https://reviews.llvm.org/D107990
diff --git a/flang/test/Driver/code-gen.f90 b/flang/test/Driver/code-gen.f90
@@ -5,8 +5,6 @@
 ! rejected earlier).
 ! TODO: Replace this file with a proper test once code-generation is available.
 
-! REQUIRES: new-flang-driver
-
 !-----------
 ! RUN LINES
 !-----------
diff --git a/flang/test/Driver/driver-error-cc1.c b/flang/test/Driver/driver-error-cc1.c
@@ -1,8 +1,6 @@
 // C files are currently not supported (i.e. `flang -cc1`). Make sure that the
 // driver reports this as expected.
 
-// REQUIRES: new-flang-driver
-
 //-----------
 // RUN LINES
 //-----------
diff --git a/flang/test/Driver/driver-error-cc1.cpp b/flang/test/Driver/driver-error-cc1.cpp
@@ -1,8 +1,6 @@
 // C++ files are currently not supported (i.e. `flang -cc1`). Make sure that the
 // driver reports this as expected.
 
-// REQUIRES: new-flang-driver
-
 //-----------
 // RUN LINES
 //-----------
diff --git a/flang/test/Driver/driver-help-hidden.f90 b/flang/test/Driver/driver-help-hidden.f90
@@ -1,4 +1,3 @@
-! REQUIRES: new-flang-driver
 
 !--------------------------
 ! FLANG DRIVER (flang-new)
diff --git a/flang/test/Driver/driver-help.f90 b/flang/test/Driver/driver-help.f90
@@ -1,4 +1,3 @@
-! REQUIRES: new-flang-driver
 
 !--------------------------
 ! FLANG DRIVER (flang)
diff --git a/flang/test/Driver/driver-version.f90 b/flang/test/Driver/driver-version.f90
@@ -1,4 +1,3 @@
-! REQUIRES: new-flang-driver
 
 !-----------
 ! RUN LINES
diff --git a/flang/test/Driver/dump-all.f90 b/flang/test/Driver/dump-all.f90
@@ -1,4 +1,3 @@
-! REQUIRES: new-flang-driver
 
 !----------
 ! RUN lines
diff --git a/flang/test/Driver/fixed-line-length.f90 b/flang/test/Driver/fixed-line-length.f90
@@ -1,7 +1,5 @@
 ! Ensure argument -ffixed-line-length=n works as expected.
 
-! REQUIRES: new-flang-driver
-
 !--------------------------
 ! FLANG DRIVER (flang)
 !--------------------------
diff --git a/flang/test/Driver/frontend-forwarding.f90 b/flang/test/Driver/frontend-forwarding.f90
@@ -1,8 +1,6 @@
 ! Test that flang-new forwards Flang frontend
 ! options to flang-new -fc1 as expected.
 
-! REQUIRES: new-flang-driver
-
 ! RUN: %flang -fsyntax-only -### %s -o %t 2>&1 \
 ! RUN:     -finput-charset=utf-8 \
 ! RUN:     -fdefault-double-8 \
diff --git a/flang/test/Driver/init-only.f90 b/flang/test/Driver/init-only.f90
@@ -1,7 +1,5 @@
 ! Verify that -init-only flag generates a diagnostic as expected
 
-! REQUIRES: new-flang-driver
-
 ! RUN: %flang_fc1 -init-only 2>&1 | FileCheck %s
 
 ! CHECK: warning: Use `-init-only` for testing purposes only
diff --git a/flang/test/Driver/input-from-stdin.f90 b/flang/test/Driver/input-from-stdin.f90
@@ -1,7 +1,5 @@
 ! Verify that reading from stdin works as expected
 
-! REQUIRES: new-flang-driver
-
 !--------------------------
 ! FLANG DRIVER (flang)
 !--------------------------
diff --git a/flang/test/Driver/macro-multiline.F90 b/flang/test/Driver/macro-multiline.F90
@@ -1,7 +1,5 @@
 ! 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)
 !--------------------------
diff --git a/flang/test/Driver/missing-arg.f90 b/flang/test/Driver/missing-arg.f90
@@ -1,8 +1,6 @@
 ! Make sure that frontend driver options that require arguments are
 ! correctly rejected when the argument value is missing.
 
-! REQUIRES: new-flang-driver
-
 !-----------
 ! RUN lines
 !-----------
diff --git a/flang/test/Driver/missing-input.f90 b/flang/test/Driver/missing-input.f90
@@ -5,8 +5,6 @@
 ! (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)
 !--------------------------
diff --git a/flang/test/Driver/phases.f90 b/flang/test/Driver/phases.f90
@@ -1,7 +1,5 @@
 ! This test verifies the phase control in Flang compiler driver.
 
-! REQUIRES: new-flang-driver
-
 !-----------
 ! RUN LINES
 !-----------
diff --git a/flang/test/Driver/plugin-example.f90 b/flang/test/Driver/plugin-example.f90
@@ -2,7 +2,7 @@
 ! Also check that when a plugin name isn't found, the error diagnostic is correct
 ! This requires that the examples are built (FLANG_BUILD_EXAMPLES=ON)
 
-! REQUIRES: new-flang-driver, plugins, examples, shell
+! REQUIRES: plugins, examples, shell
 
 ! RUN: %flang_fc1 -load %llvmshlibdir/flangHelloWorldPlugin%pluginext -plugin -hello-world %s 2>&1 | FileCheck %s
 ! CHECK: Hello World from your new Flang plugin
diff --git a/flang/test/Driver/std2018-wrong.f90 b/flang/test/Driver/std2018-wrong.f90
@@ -1,4 +1,3 @@
-! REQUIRES: new-flang-driver
 ! Ensure argument -std=f2018 works as expected.
 
 !-----------------------------------------
diff --git a/flang/test/Driver/syntax-only.f90 b/flang/test/Driver/syntax-only.f90
@@ -3,8 +3,6 @@
 ! don't need to test the frontend driver here - it runs `-fsyntax-only` by
 ! default.
 
-! REQUIRES: new-flang-driver
-
 !-----------
 ! RUN LINES
 !-----------
diff --git a/flang/test/Driver/use-module-error.f90 b/flang/test/Driver/use-module-error.f90
@@ -1,7 +1,5 @@
 ! Ensure that multiple module directories are not allowed
 
-! REQUIRES: new-flang-driver
-
 !--------------------------
 ! FLANG DRIVER (flang-new)
 !--------------------------
diff --git a/flang/test/Driver/werror-wrong.f90 b/flang/test/Driver/werror-wrong.f90
@@ -1,5 +1,4 @@
 ! Ensure that only argument -Werror is supported.
-! REQUIRES: new-flang-driver
 
 ! RUN: not %flang_fc1 -fsyntax-only -Wall %s  2>&1 | FileCheck %s --check-prefix=WRONG
 ! RUN: not %flang_fc1 -fsyntax-only -WX %s  2>&1 | FileCheck %s --check-prefix=WRONG
diff --git a/flang/test/Frontend/input-output-file.f90 b/flang/test/Frontend/input-output-file.f90
@@ -1,4 +1,3 @@
-! REQUIRES: new-flang-driver
 
 !--------------------------
 ! FLANG DRIVER (flang)
diff --git a/flang/test/Frontend/multiple-input-files.f90 b/flang/test/Frontend/multiple-input-files.f90
@@ -1,4 +1,3 @@
-! REQUIRES: new-flang-driver
 
 !--------------------------
 ! FLANG DRIVER (flang)
diff --git a/flang/test/lit.cfg.py b/flang/test/lit.cfg.py
@@ -40,10 +40,6 @@
 # directories.
 config.excludes = ['Inputs', 'CMakeLists.txt', 'README.txt', 'LICENSE.txt']
 
-# If the new Flang driver is enabled, add the corresponding feature to
-# config.
-config.available_features.add('new-flang-driver')
-
 # If the flang examples are built, add examples to the config
 if config.flang_examples:
     config.available_features.add('examples')

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-! REQUIRES: new-flang-driver`
`2`	`1`
`3`	`2`	`!--------------------------`
`4`	`3`	`! FLANG DRIVER (flang-new)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-! REQUIRES: new-flang-driver`
`2`	`1`
`3`	`2`	`!-----------`
`4`	`3`	`! RUN LINES`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-! REQUIRES: new-flang-driver`
`2`	`1`
`3`	`2`	`!----------`
`4`	`3`	`! RUN lines`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-! REQUIRES: new-flang-driver`
`2`	`1`	`! Ensure argument -std=f2018 works as expected.`
`3`	`2`
`4`	`3`	`!-----------------------------------------`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`! Ensure that only argument -Werror is supported.`
`2`		`-! REQUIRES: new-flang-driver`
`3`	`2`
`4`	`3`	`! RUN: not %flang_fc1 -fsyntax-only -Wall %s 2>&1 \| FileCheck %s --check-prefix=WRONG`
`5`	`4`	`! RUN: not %flang_fc1 -fsyntax-only -WX %s 2>&1 \| FileCheck %s --check-prefix=WRONG`