[polly] r203925 - autoconf: Fix module loading in tests

[Tobias Grosser]

Author: grosser
Date: Fri Mar 14 08:27:26 2014
New Revision: 203925

URL: http://llvm.org/viewvc/llvm-project?rev=203925&view=rev
Log:
autoconf: Fix module loading in tests

Modified:
    polly/trunk/test/Makefile
    polly/trunk/test/lit.site.cfg.in

Modified: polly/trunk/test/Makefile
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Makefile?rev=203925&r1=203924&r2=203925&view=diff
==============================================================================
--- polly/trunk/test/Makefile (original)
+++ polly/trunk/test/Makefile Fri Mar 14 08:27:26 2014
@@ -53,6 +53,7 @@ lit.site.cfg: FORCE
 	     -e "s#@TARGET_TRIPLE@#$(TARGET_TRIPLE)#g" \
 	     -e "s#@LLVM_SHLIBEXT@#$(SHLIBEXT)#g" \
              -e "s#@POLLY_LIB_DIR@#$(LibDir)#g" \
+             -e "s#@LINK_POLLY_INTO_TOOLS@#OFF#g" \
 	     $(PROJ_SRC_DIR)/lit.site.cfg.in > $@
 
 clean::

Modified: polly/trunk/test/lit.site.cfg.in
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/lit.site.cfg.in?rev=203925&r1=203924&r2=203925&view=diff
==============================================================================
--- polly/trunk/test/lit.site.cfg.in (original)
+++ polly/trunk/test/lit.site.cfg.in Fri Mar 14 08:27:26 2014
@@ -9,6 +9,7 @@ config.polly_lib_dir = "@POLLY_LIB_DIR@"
 config.target_triple = "@TARGET_TRIPLE@"
 config.enable_gpgpu_codegen = "@CUDALIB_FOUND@"
 config.cloog_found = "@CLOOG_FOUND@"
+config.link_polly_into_tools = "@LINK_POLLY_INTO_TOOLS@"
 
 ## Check the current platform with regex
 import re
@@ -25,14 +26,14 @@ except KeyError,e:
     key, = e.args
     lit_config.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key,key))
 
-if '@LINK_POLLY_INTO_TOOLS@' == '' or \
-   '@LINK_POLLY_INTO_TOOLS@'.lower() == '0' or \
-   '@LINK_POLLY_INTO_TOOLS@'.lower() == 'n' or \
-   '@LINK_POLLY_INTO_TOOLS@'.lower() == 'no' or \
-   '@LINK_POLLY_INTO_TOOLS@'.lower() == 'off' or \
-   '@LINK_POLLY_INTO_TOOLS@'.lower() == 'false' or \
-   '@LINK_POLLY_INTO_TOOLS@'.lower() == 'notfound' or \
-   '@LINK_POLLY_INTO_TOOLS@'.lower() == 'link_polly_into_tools-notfound':
+if config.link_polly_into_tools == '' or \
+   config.link_polly_into_tools.lower() == '0' or \
+   config.link_polly_into_tools.lower() == 'n' or \
+   config.link_polly_into_tools.lower() == 'no' or \
+   config.link_polly_into_tools.lower() == 'off' or \
+   config.link_polly_into_tools.lower() == 'false' or \
+   config.link_polly_into_tools.lower() == 'notfound' or \
+   config.link_polly_into_tools.lower() == 'link_polly_into_tools-notfound':
     config.substitutions.append(('%loadPolly', '-load '
                                  + config.polly_lib_dir + '/LLVMPolly at LLVM_SHLIBEXT@'))
 else: