diff options
| author | Camille Mougey <commial@gmail.com> | 2015-04-22 19:12:10 +0200 |
|---|---|---|
| committer | Camille Mougey <commial@gmail.com> | 2015-04-22 19:12:10 +0200 |
| commit | f137c8b663d03623780532bb120c9238d69d1482 (patch) | |
| tree | 68f6d538a9ef16edc7aa5730320796d550c5cd91 /test | |
| parent | 9039f508b2e2d407495d1ab6f74cc78cc891f822 (diff) | |
| parent | 5699ee60b9052a936fa1e511a4cc455cfe8b8dc4 (diff) | |
| download | miasm-f137c8b663d03623780532bb120c9238d69d1482.tar.gz miasm-f137c8b663d03623780532bb120c9238d69d1482.zip | |
Merge pull request #142 from serpilliere/automod
Automod
Diffstat (limited to 'test')
| -rw-r--r-- | test/ir/ir2C.py | 4 | ||||
| -rw-r--r-- | test/test_all.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/ir/ir2C.py b/test/ir/ir2C.py index 48518c50..3a89b328 100644 --- a/test/ir/ir2C.py +++ b/test/ir/ir2C.py @@ -46,9 +46,9 @@ class TestIrIr2C(unittest.TestCase): self.translationTest( ExprOp('fadd', *args[:2]), r'fadd(0x0, 0x1)') self.translationTest( - ExprOp('segm', *args[:2]), r'segm2addr(vmcpu, 0x0, 0x1)') + ExprOp('segm', *args[:2]), r'segm2addr(jitcpu, 0x0, 0x1)') self.translationTest( - ExprOp('imod', *args[:2]), r'imod32(vmcpu, 0x0, 0x1)') + ExprOp('imod', *args[:2]), r'imod32(jitcpu, 0x0, 0x1)') self.translationTest( ExprOp('bcdadd', *args[:2]), r'bcdadd_32(0x0, 0x1)') self.assertRaises(NotImplementedError, translator.from_expr, diff --git a/test/test_all.py b/test/test_all.py index fd8d5ad7..52f2238b 100644 --- a/test/test_all.py +++ b/test/test_all.py @@ -195,7 +195,7 @@ class ExampleShellcode(ExampleAssembler): testset += ExampleShellcode(['x86_32', 'x86_32_manip_ptr.S', "demo_x86_32.bin"]) test_box = {} -test_box_names = ["mod", "mod_self", "repmod", "simple", "enc", "pop_esp"] +test_box_names = ["mod", "mod_self", "repmod", "simple", "enc", "pop_esp", "automod"] for source in test_box_names: sample_base = "x86_32_" + source args = ["x86_32", sample_base + ".S", sample_base + ".bin", "--PE"] |