Test/jitter for each jitter engine

4 files changed, 9 insertions, 11 deletions

diff --git a/test/jitter/jit_options.py b/test/jitter/jit_options.py
index 41f6b4b8..cc955c64 100644
--- a/test/jitter/jit_options.py
+++ b/test/jitter/jit_options.py
@@ -1,15 +1,9 @@
 import os
-from argparse import ArgumentParser
+import sys
 from miasm2.jitter.csts import PAGE_READ, PAGE_WRITE
 from miasm2.analysis.machine import Machine
 from pdb import pm
 
-parser = ArgumentParser(description="x86 32 basic Jitter")
-parser.add_argument("-j", "--jitter",
-                    help="Jitter engine. Possible values are : tcc (default), llvm",
-                    default="tcc")
-args = parser.parse_args()
-
 # Shellcode
 
 # main:
@@ -33,7 +27,7 @@ def code_sentinelle(jitter):
 def init_jitter():
     global data, run_addr
     # Create jitter
-    myjit = Machine("x86_32").jitter(args.jitter)
+    myjit = Machine("x86_32").jitter(sys.argv[1])
 
     myjit.vm.add_memory_page(run_addr, PAGE_READ | PAGE_WRITE, data)
 
diff --git a/test/jitter/jitload.py b/test/jitter/jitload.py
index 283298db..544e9d18 100644
--- a/test/jitter/jitload.py
+++ b/test/jitter/jitload.py
@@ -1,3 +1,4 @@
+import sys
 from pdb import pm
 
 from miasm2.jitter.csts import PAGE_READ, PAGE_WRITE
@@ -9,7 +10,7 @@ from miasm2.expression.expression import ExprId, ExprInt32, ExprInt64, ExprAff,
 data = "8d49048d5b0180f90174058d5bffeb038d5b0189d8c3".decode("hex")
 
 # Init jitter
-myjit = Machine("x86_32").jitter()
+myjit = Machine("x86_32").jitter(sys.argv[1])
 myjit.init_stack()
 
 run_addr = 0x40000000
diff --git a/test/jitter/vm_mngr.py b/test/jitter/vm_mngr.py
index b2b7336b..87bc6f8f 100644
--- a/test/jitter/vm_mngr.py
+++ b/test/jitter/vm_mngr.py
@@ -1,7 +1,8 @@
+import sys
 from miasm2.jitter.csts import PAGE_READ, PAGE_WRITE
 from miasm2.analysis.machine import Machine
 
-myjit = Machine("x86_32").jitter()
+myjit = Machine("x86_32").jitter(sys.argv[1])
 
 base_addr = 0x13371337
 page_size = 0x1000
diff --git a/test/test_all.py b/test/test_all.py
index 07ac21dd..a3f3323c 100644
--- a/test/test_all.py
+++ b/test/test_all.py
@@ -325,7 +325,9 @@ for script in ["jitload.py",
                "vm_mngr.py",
                "jit_options.py",
                ]:
-    testset += RegressionTest([script], base_dir="jitter", tags=[TAGS["tcc"]])
+    for engine in ArchUnitTest.jitter_engines:
+        testset += RegressionTest([script, engine], base_dir="jitter",
+                                  tags=[TAGS.get(engine,None)])
 
 
 # Examples