[PATCH] D97207: [flang][test] Share all driver test dirs between `f18` and `flang-new`

[Andrzej Warzynski via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rG5e54bef4d291: [flang][test] Share all driver test dirs between `f18` and `flang-new` (authored by awarzynski).

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D97207/new/

https://reviews.llvm.org/D97207

Files:
  flang/test/Frontend/prescanner-diag.f90
  flang/test/lit.cfg.py


Index: flang/test/lit.cfg.py
===================================================================
--- flang/test/lit.cfg.py
+++ flang/test/lit.cfg.py
@@ -39,12 +39,9 @@
 config.excludes = ['Inputs', 'CMakeLists.txt', 'README.txt', 'LICENSE.txt']
 
 # If the new Flang driver is enabled, add the corresponding feature to
-# config. Otherwise, exclude the corresponding test directory.
+# config.
 if config.include_flang_new_driver_test:
   config.available_features.add('new-flang-driver')
-else:
-  config.excludes.append('Flang-Driver')
-  config.excludes.append('Frontend')
 
 # test_source_root: The root path where tests are located.
 config.test_source_root = os.path.dirname(__file__)
Index: flang/test/Frontend/prescanner-diag.f90
===================================================================
--- flang/test/Frontend/prescanner-diag.f90
+++ flang/test/Frontend/prescanner-diag.f90
@@ -1,17 +1,15 @@
 ! Test that the driver correctly reports diagnostics from the prescanner. The contents of the include file are irrelevant here.
 
 ! Test with -E (i.e. PrintPreprocessedAction, stops after prescanning)
-! RUN: %f18 -E -I %S/Inputs/ %s 2>&1 | FileCheck %s
-! RUN: %flang-new -E -I %S/Inputs/ %s 2>&1 | FileCheck %s
-! RUN: %flang-new -fc1 -E -I %S/Inputs/ %s 2>&1 | FileCheck %s
+! 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: %f18 -fsyntax-only -I %S/Inputs/ %s 2>&1 | FileCheck %s
-! RUN: %flang-new -fsyntax-only -I %S/Inputs/ %s 2>&1 | FileCheck %s
-! RUN: %flang-new -fc1 -fsyntax-only -I %S/Inputs/ %s 2>&1 | FileCheck %s
+! 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:14:20: #include: extra stuff ignored after file name
+! CHECK: prescanner-diag.f90:12:20: #include: extra stuff ignored after file name
 #include <empty.h> comment
-! CHECK: prescanner-diag.f90:16:20: #include: extra stuff ignored after file name
+! CHECK: prescanner-diag.f90:14:20: #include: extra stuff ignored after file name
 #include "empty.h" comment
 end


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D97207.325830.patch
Type: text/x-patch
Size: 2232 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20210223/2ab8aca4/attachment.bin>