[PATCH] D27739: Disable libLTO tests when libLTO is not built

[Derek Schuff via Phabricator via llvm-commits]

dschuff updated this revision to Diff 81333.
dschuff added a comment.

- Use configuration variables from lit.site.cfg.in instead


https://reviews.llvm.org/D27739

Files:
  test/lit.cfg
  test/lit.site.cfg.in


Index: test/lit.site.cfg.in
===================================================================
--- test/lit.site.cfg.in
+++ test/lit.site.cfg.in
@@ -15,6 +15,8 @@
 config.python_executable = "@PYTHON_EXECUTABLE@"
 config.gold_executable = "@GOLD_EXECUTABLE@"
 config.ld64_executable = "@LD64_EXECUTABLE@"
+config.llvm_tool_llvm_shlib_build = "@LLVM_TOOL_LLVM_SHLIB_BUILD@"
+config.llvm_tool_lto_build = "@LLVM_TOOL_LTO_BUILD@"
 config.ocamlfind_executable = "@OCAMLFIND@"
 config.have_ocamlopt = "@HAVE_OCAMLOPT@"
 config.have_ocaml_ounit = "@HAVE_OCAML_OUNIT@"
Index: test/lit.cfg
===================================================================
--- test/lit.cfg
+++ test/lit.cfg
@@ -420,7 +420,7 @@
 import subprocess
 
 def have_ld_plugin_support():
-    if not os.path.exists(os.path.join(config.llvm_shlib_dir, 'LLVMgold.so')):
+    if not config.llvm_tool_llvm_shlib_build:
         return False
 
     ld_cmd = subprocess.Popen([config.gold_executable, '--help'], stdout = subprocess.PIPE, env={'LANG': 'C'})
@@ -455,7 +455,7 @@
     config.available_features.add('ld_plugin')
 
 def have_ld64_plugin_support():
-    if config.ld64_executable == '':
+    if (not config.llvm_tool_lto_build or config.ld64_executable == ''):
         return False
 
     ld_cmd = subprocess.Popen([config.ld64_executable, '-v'], stderr = subprocess.PIPE)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D27739.81333.patch
Type: text/x-patch
Size: 1348 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20161214/19ffaab0/attachment.bin>