about summary refs log tree commit diff stats
path: root/test/test_all.py
diff options
context:
space:
mode:
authorserpilliere <serpilliere@users.noreply.github.com>2017-01-05 10:41:32 +0100
committerGitHub <noreply@github.com>2017-01-05 10:41:32 +0100
commitc551e1e761b14b962ae327e6752599b7934ba9cc (patch)
tree4ed186bb5cef2793569d125f42b681dbac4b2fb4 /test/test_all.py
parent2b93bc6682f3a08a5eccccefa135535708434f9e (diff)
parent66d61fa8b799214f42be7ba42fe8138e302978bb (diff)
downloadmiasm-c551e1e761b14b962ae327e6752599b7934ba9cc.tar.gz
miasm-c551e1e761b14b962ae327e6752599b7934ba9cc.zip
Merge pull request #458 from commial/feature-llvm-jitter
Feature llvm jitter
Diffstat (limited to 'test/test_all.py')
-rw-r--r--test/test_all.py9
1 files changed, 3 insertions, 6 deletions
diff --git a/test/test_all.py b/test/test_all.py
index 62f1cd4b..7cc8f6eb 100644
--- a/test/test_all.py
+++ b/test/test_all.py
@@ -55,7 +55,7 @@ class ArchUnitTest(RegressionTest):
 
 # script -> blacklisted jitter
 blacklist = {
-    "x86/unit/mn_float.py": ["python"],
+    "x86/unit/mn_float.py": ["python", "llvm"],
 }
 for script in ["x86/sem.py",
                "x86/unit/mn_strings.py",
@@ -684,7 +684,7 @@ By default, no tag is omitted." % ", ".join(TAGS.keys()), default="")
     # Handle llvm modularity
     llvm = True
     try:
-        import llvm
+        import llvmlite
     except ImportError:
         llvm = False
 
@@ -695,12 +695,9 @@ By default, no tag is omitted." % ", ".join(TAGS.keys()), default="")
     except ImportError:
         tcc = False
 
-    # TODO XXX: fix llvm jitter (deactivated for the moment)
-    llvm = False
-
     if llvm is False:
         print "%(red)s[LLVM]%(end)s Python" % cosmetics.colors + \
-            "'py-llvm 3.2' module is required for llvm tests"
+            "'llvmlite' module is required for llvm tests"
 
         # Remove llvm tests
         if TAGS["llvm"] not in exclude_tags: