[rebase] use flang_new in tests like upstream

Author: jeanPerier

flang/test/lit.cfg.py

@@ -95,15 +95,9 @@
     unresolved='fatal')
 ]
 
-if config.include_flang_new_driver_test:
-   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'))
+tools.append(ToolSubst('%flang', command=FindTool('flang-new'), unresolved='fatal'))
+tools.append(ToolSubst('%flang_fc1', command=FindTool('flang-new'),
+ extra_args=['-fc1'], unresolved='fatal'))
 
 # Define some variables to help us test that the flang runtime doesn't depend on
 # the C++ runtime libraries. For this we need a C compiler. If for some reason

flang/test/lit.site.cfg.py.in

@@ -22,11 +22,6 @@ config.cplusplus_executable = "@CMAKE_CXX_COMPILER@"
 config.macos_sysroot = "@CMAKE_OSX_SYSROOT@"
 config.flang_standalone_build = "@FLANG_STANDALONE_BUILD@"
 
-# Control the regression test for flang-new driver
-import lit.util
-config.include_flang_new_driver_test = \
-    lit.util.pythonize_bool("@FLANG_BUILD_NEW_DRIVER@")
-
 # Support substitution of the tools_dir with user parameters. This is
 # used when we can't determine the tool dir at configuration time.
 try: