[llvm] r289662 - Disable libLTO tests when libLTO is not built

[Derek Schuff via llvm-commits]

Author: dschuff
Date: Wed Dec 14 10:20:22 2016
New Revision: 289662

URL: http://llvm.org/viewvc/llvm-project?rev=289662&view=rev
Log:
Disable libLTO tests when libLTO is not built

Summary:
The current test only checks whether ld64 is available, causing tests
to fail when ld64 is avilable but libLTO is not built.

Reviewers: beanz, mehdi_amini

Subscribers: mehdi_amini, llvm-commits

Differential Revision: https://reviews.llvm.org/D27739

Modified:
    llvm/trunk/test/lit.cfg
    llvm/trunk/test/lit.site.cfg.in

Modified: llvm/trunk/test/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/lit.cfg?rev=289662&r1=289661&r2=289662&view=diff
==============================================================================
--- llvm/trunk/test/lit.cfg (original)
+++ llvm/trunk/test/lit.cfg Wed Dec 14 10:20:22 2016
@@ -420,7 +420,7 @@ if config.host_triple == config.target_t
 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 @@ if have_ld_plugin_support():
     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)

Modified: llvm/trunk/test/lit.site.cfg.in
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/lit.site.cfg.in?rev=289662&r1=289661&r2=289662&view=diff
==============================================================================
--- llvm/trunk/test/lit.site.cfg.in (original)
+++ llvm/trunk/test/lit.site.cfg.in Wed Dec 14 10:20:22 2016
@@ -15,6 +15,8 @@ config.lit_tools_dir = "@LLVM_LIT_TOOLS_
 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@"