[flang-commits] [flang] 5437f2e - [flang][nfc] Remove `flang-new-driver` from LIT
Andrzej Warzynski via flang-commits
flang-commits at lists.llvm.org
Fri Aug 13 01:17:52 PDT 2021
Author: Andrzej Warzynski
Date: 2021-08-13T08:17:40Z
New Revision: 5437f2e9a98bec3e546e67903bac49cfc8c0c004
URL: https://github.com/llvm/llvm-project/commit/5437f2e9a98bec3e546e67903bac49cfc8c0c004
DIFF: https://github.com/llvm/llvm-project/commit/5437f2e9a98bec3e546e67903bac49cfc8c0c004.diff
LOG: [flang][nfc] Remove `flang-new-driver` from LIT
After merging https://reviews.llvm.org/D105811, `flang-new-driver` is no
longer required.
Differential Revision: https://reviews.llvm.org/D107990
Added:
Modified:
flang/test/Driver/code-gen.f90
flang/test/Driver/driver-error-cc1.c
flang/test/Driver/driver-error-cc1.cpp
flang/test/Driver/driver-help-hidden.f90
flang/test/Driver/driver-help.f90
flang/test/Driver/driver-version.f90
flang/test/Driver/dump-all.f90
flang/test/Driver/fixed-line-length.f90
flang/test/Driver/frontend-forwarding.f90
flang/test/Driver/init-only.f90
flang/test/Driver/input-from-stdin.f90
flang/test/Driver/macro-multiline.F90
flang/test/Driver/missing-arg.f90
flang/test/Driver/missing-input.f90
flang/test/Driver/phases.f90
flang/test/Driver/plugin-example.f90
flang/test/Driver/std2018-wrong.f90
flang/test/Driver/syntax-only.f90
flang/test/Driver/use-module-error.f90
flang/test/Driver/werror-wrong.f90
flang/test/Frontend/input-output-file.f90
flang/test/Frontend/multiple-input-files.f90
flang/test/lit.cfg.py
Removed:
################################################################################
diff --git a/flang/test/Driver/code-gen.f90 b/flang/test/Driver/code-gen.f90
index b806a9ad120f..53ee40d3d9cf 100644
--- 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
index 2eb2fd02ee66..41562e549f81 100644
--- 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
index f752f8ae10f5..61ee482f2e1f 100644
--- 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
index 7b8ffb818f79..9e63408b7559 100644
--- 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
index bc2dc7e3fc99..441cf73f9d0c 100644
--- 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
index bfa2149de33a..c3569be12a1a 100644
--- 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
index 3a957664b847..2d209ce4209c 100644
--- 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
index 930b20b956b0..be55280de4a5 100644
--- 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
index d206ff04e1ae..ef7e10a56025 100644
--- 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
index ecfa7ba13bba..eb3b799431b3 100644
--- 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
index 4829024d7c0b..f05318bdec4c 100644
--- 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
index 0bf23f0fe48f..7703885971e9 100644
--- 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
index 3a16542e04e8..157fd9d0976d 100644
--- 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
index ad56c65bff05..d9d444edfab1 100644
--- 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
index 0f6e2450f330..eeaed03dc6f1 100644
--- 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
index eb009dea1f13..73a48e34e72c 100644
--- 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
index 867d014c4c11..b896417680c8 100644
--- 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
index be61b63d2a58..8ecfc2c59c18 100644
--- 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
index 5d19e9b1c385..6834bf52c2b4 100644
--- 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
index 6c18f1663f98..3151bb165dc9 100644
--- 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
index e93289f88d17..e68041f66478 100644
--- 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
index 406b6c0539be..977fea2d6b3e 100644
--- 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
index 4c69b688d042..b44a4239457e 100644
--- 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')
More information about the flang-commits
mailing list