[pypy-svn] r23722 - in pypy/dist/pypy/translator/llvm: . test

[rxe at codespeak.net]

Author: rxe
Date: Tue Feb 28 02:00:53 2006
New Revision: 23722

Modified:
   pypy/dist/pypy/translator/llvm/buildllvm.py
   pypy/dist/pypy/translator/llvm/genllvm.py
   pypy/dist/pypy/translator/llvm/test/runtest.py
Log:
(pmaupin, rxe)
Factor out to one place tests for if we have right version of llvm.



Modified: pypy/dist/pypy/translator/llvm/buildllvm.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/buildllvm.py	(original)
+++ pypy/dist/pypy/translator/llvm/buildllvm.py	Tue Feb 28 02:00:53 2006
@@ -18,7 +18,6 @@
     return True
 
 def llvm_version():
-    import os
     v = os.popen('llvm-as -version 2>&1').readline()
     v = ''.join([c for c in v if c.isdigit()])
     v = int(v) / 10.0

Modified: pypy/dist/pypy/translator/llvm/genllvm.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/genllvm.py	(original)
+++ pypy/dist/pypy/translator/llvm/genllvm.py	Tue Feb 28 02:00:53 2006
@@ -17,6 +17,7 @@
 from pypy.translator.llvm.exception import ExceptionPolicy
 from pypy.translator.llvm.log import log
 from pypy import conftest
+from pypy.translator.llvm.buildllvm import llvm_is_on_path
 
 class GenLLVM(object):
 
@@ -298,6 +299,8 @@
     return gen.compile_llvm_source(**kwds)
 
 def genllvm_compile(function, annotation, view=False, optimize=True, **kwds):
+    assert llvm_is_on_path()
+    
     from pypy.translator.translator import TranslationContext
     from pypy.translator.backendopt.all import backend_optimizations
     t = TranslationContext()

Modified: pypy/dist/pypy/translator/llvm/test/runtest.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/test/runtest.py	(original)
+++ pypy/dist/pypy/translator/llvm/test/runtest.py	Tue Feb 28 02:00:53 2006
@@ -1,24 +1,9 @@
 import py
 from pypy.translator.llvm.genllvm import genllvm_compile
-
+from pypy.translator.llvm.buildllvm import llvm_is_on_path, llvm_version
 optimize_tests = False
 MINIMUM_LLVM_VERSION = 1.6
 
-def llvm_is_on_path():
-    try:
-        py.path.local.sysfind("llvm-as")
-        py.path.local.sysfind("llvm-gcc")
-    except py.error.ENOENT: 
-        return False 
-    return True
-
-def llvm_version():
-    import os
-    v = os.popen('llvm-as -version 2>&1').readline()
-    v = ''.join([c for c in v if c.isdigit()])
-    v = int(v) / 10.0
-    return v
-
 def llvm_test():
     if not llvm_is_on_path():
         py.test.skip("llvm not found")