about summary refs log tree commit diff stats
path: root/test
diff options
context:
space:
mode:
authorFabrice Desclaux <fabrice.desclaux@cea.fr>2020-07-21 15:37:39 +0200
committerFabrice Desclaux <fabrice.desclaux@cea.fr>2020-07-21 16:47:59 +0200
commit82c5d696eb97b5816a276cbf9708d0b3602d7055 (patch)
treee90ca108dd1c130d015a3960051276d2c58d233a /test
parent9bf0f4c1c14d318110b56df6952b0fcc2950539e (diff)
downloadfocaccia-miasm-82c5d696eb97b5816a276cbf9708d0b3602d7055.tar.gz
focaccia-miasm-82c5d696eb97b5816a276cbf9708d0b3602d7055.zip
Move modint in core
Diffstat (limited to 'test')
-rw-r--r--test/core/modint.py (renamed from test/expression/modint.py)2
-rw-r--r--test/jitter/jitload.py2
-rwxr-xr-xtest/test_all.py6
3 files changed, 5 insertions, 5 deletions
diff --git a/test/expression/modint.py b/test/core/modint.py
index af80b284..d493b44e 100644
--- a/test/expression/modint.py
+++ b/test/core/modint.py
@@ -1,6 +1,6 @@
 from __future__ import print_function
 
-from miasm.expression.modint import *
+from miasm.core.modint import *
 
 a = uint8(0x42)
 b = uint8(0xFF)
diff --git a/test/jitter/jitload.py b/test/jitter/jitload.py
index 8b758a89..3038c21c 100644
--- a/test/jitter/jitload.py
+++ b/test/jitter/jitload.py
@@ -47,4 +47,4 @@ assert myjit.eval_expr(eax) == imm4
 ## Changes must be passed on myjit.cpu instance
 assert myjit.cpu.EAX == 4
 ## Memory
-assert myjit.eval_expr(memdata).arg.arg == int(encode_hex(data[::-1]), 16)
+assert int(myjit.eval_expr(memdata)) == int(encode_hex(data[::-1]), 16)
diff --git a/test/test_all.py b/test/test_all.py
index 71eccc6f..2670761b 100755
--- a/test/test_all.py
+++ b/test/test_all.py
@@ -305,7 +305,8 @@ testset += SemanticTestExec("x86_32", "PE", 0x401000, ["bsr_bsf"],
                             depends=[test_x86_32_bsr_bsf])
 
 ## Core
-for script in ["interval.py",
+for script in ["modint.py",
+               "interval.py",
                "graph.py",
                "parse_asm.py",
                "utils.py",
@@ -318,8 +319,7 @@ testset += RegressionTest(["asmblock.py"], base_dir="core",
                           products=["graph.dot", "graph2.dot",
                                     "graph3.dot", "graph4.dot"])
 ## Expression
-for script in ["modint.py",
-               "expression.py",
+for script in ["expression.py",
                "stp.py",
                "simplifications.py",
                "expression_helper.py",