[pypy-svn] r64017 - in pypy/branch/cbuild-llvm/pypy/translator/tool: . test

getxsick at codespeak.net getxsick at codespeak.net
Mon Apr 13 05:29:03 CEST 2009


Author: getxsick
Date: Mon Apr 13 05:29:01 2009
New Revision: 64017

Modified:
   pypy/branch/cbuild-llvm/pypy/translator/tool/cbuild.py
   pypy/branch/cbuild-llvm/pypy/translator/tool/test/test_cbuild.py
Log:
fixes for the last premature commit
short advice: don't commit at 4:30am


Modified: pypy/branch/cbuild-llvm/pypy/translator/tool/cbuild.py
==============================================================================
--- pypy/branch/cbuild-llvm/pypy/translator/tool/cbuild.py	(original)
+++ pypy/branch/cbuild-llvm/pypy/translator/tool/cbuild.py	Mon Apr 13 05:29:01 2009
@@ -159,7 +159,7 @@
         Return a new ExternalCompilationInfo instance by executing
         the 'llvmconfig' with --cflags, --ldflags and '--libs all' arguments.
         """
-        path = py.path.local.sysfind(execonfigtool)
+        path = py.path.local.sysfind(llvmconfig)
         if not path:
             raise ImportError("cannot find %r" % (execonfigtool,))
             # we raise ImportError to be nice to the pypy.config.pypyoption

Modified: pypy/branch/cbuild-llvm/pypy/translator/tool/test/test_cbuild.py
==============================================================================
--- pypy/branch/cbuild-llvm/pypy/translator/tool/test/test_cbuild.py	(original)
+++ pypy/branch/cbuild-llvm/pypy/translator/tool/test/test_cbuild.py	Mon Apr 13 05:29:01 2009
@@ -121,9 +121,9 @@
         llvmconfig = py.path.local.sysfind('llvm-config')
         if not llvmconfig:
             py.test.skip("llvm-config not installed")
-        eci = ExternalCompilationInfo.from_config_tool(
-                '/home/xsx/_usr/llvm/bin/llvm-config',
-                )
+        eci = ExternalCompilationInfo.from_llvm_config()
+        assert 'LLVMCore' in eci.libraries
+        eci = ExternalCompilationInfo.from_llvm_config('llvm-config')
         assert 'LLVMCore' in eci.libraries
 
     def test_from_missing_config_tool(self):



More information about the Pypy-commit mailing list