[PATCH] D117445: [lit] Expose clang search_env string as a use_clang argument

[Amir Ayupov via Phabricator via llvm-commits]

Amir created this revision.
Amir added reviewers: jhenderson, JDevlieghere, aprantl, MaskRay, thopre, dblaikie, teemperor.
Herald added subscribers: ayermolo, delcypher.
Herald added a reviewer: rafauler.
Amir requested review of this revision.
Herald added subscribers: llvm-commits, yota9.
Herald added a project: LLVM.

Add an ability to provide a custom environment variable for clang,
to be used in BOLT tests.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D117445

Files:
  bolt/test/lit.cfg.py
  llvm/utils/lit/lit/llvm/config.py


Index: llvm/utils/lit/lit/llvm/config.py
===================================================================
--- llvm/utils/lit/lit/llvm/config.py
+++ llvm/utils/lit/lit/llvm/config.py
@@ -437,7 +437,7 @@
         return tool
 
     def use_clang(self, additional_tool_dirs=[], additional_flags=[],
-                  required=True, use_installed=False):
+                  required=True, use_installed=False, search_env='CLANG'):
         """Configure the test suite to be able to invoke clang.
 
         Sets up some environment variables important to clang, locates a
@@ -505,7 +505,7 @@
 
         # Discover the 'clang' and 'clangcc' to use.
         self.config.clang = self.use_llvm_tool(
-            'clang', search_env='CLANG', required=required,
+            'clang', search_env=search_env, required=required,
             search_paths=paths, use_installed=use_installed)
         if self.config.clang:
           self.config.available_features.add('clang')
Index: bolt/test/lit.cfg.py
===================================================================
--- bolt/test/lit.cfg.py
+++ bolt/test/lit.cfg.py
@@ -55,8 +55,10 @@
 
 llvm_config.use_default_substitutions()
 
-llvm_config.use_clang(additional_tool_dirs=[os.path.dirname(config.bolt_clang)])
-llvm_config.use_lld(additional_tool_dirs=[os.path.dirname(config.bolt_lld)])
+llvm_config.config.environment['BOLT_CLANG_EXE'] = config.bolt_clang
+llvm_config.config.environment['BOLT_LLD_EXE'] = config.bolt_lld
+llvm_config.use_clang(search_env='BOLT_CLANG_EXE')
+llvm_config.use_llvm_tool('lld', required=True, search_env='BOLT_LLD_EXE')
 
 config.substitutions.append(('%cflags', '-no-pie'))
 config.substitutions.append(('%cxxflags', '-no-pie'))


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D117445.400412.patch
Type: text/x-patch
Size: 1714 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20220117/f432bb69/attachment.bin>