about summary refs log tree commit diff stats
path: root/test/test_all.py
diff options
context:
space:
mode:
authorCamille Mougey <camille.mougey@cea.fr>2015-01-23 12:33:38 +0100
committerCamille Mougey <camille.mougey@cea.fr>2015-01-23 17:24:43 +0100
commita5f035142ce772f7868c0a67cb60d876dedfc0dc (patch)
tree812c5f101e3fb4eff22b96bf4601908b2399bebb /test/test_all.py
parentc98879f0c1df3554fb16110f4b0b49e57da29a1b (diff)
downloadmiasm-a5f035142ce772f7868c0a67cb60d876dedfc0dc.tar.gz
miasm-a5f035142ce772f7868c0a67cb60d876dedfc0dc.zip
Example/ASM: Test the x86_64 example
Diffstat (limited to 'test/test_all.py')
-rw-r--r--test/test_all.py15
1 files changed, 9 insertions, 6 deletions
diff --git a/test/test_all.py b/test/test_all.py
index 87a60994..86c8241a 100644
--- a/test/test_all.py
+++ b/test/test_all.py
@@ -116,11 +116,6 @@ class ExampleShellcode(ExampleAssembler):
 
 testset += ExampleShellcode(['x86_32', 'x86_32_manip_ptr.S', "demo_x86_32.bin"])
 
-test_armb = ExampleShellcode(["armb", "arm_simple.S", "demo_arm_b.bin"])
-test_arml = ExampleShellcode(["arml", "arm_simple.S", "demo_arm_l.bin"])
-test_armtb = ExampleShellcode(["armtb", "armt.S", "demo_armt_b.bin"])
-test_armtl = ExampleShellcode(["armtl", "armt.S", "demo_armt_l.bin"])
-
 test_box = {}
 test_box_names = ["mod", "mod_self", "repmod", "simple", "enc"]
 for source in test_box_names:
@@ -131,9 +126,15 @@ for source in test_box_names:
     test_box[source] = ExampleShellcode(args)
     testset += test_box[source]
 
+test_armb = ExampleShellcode(["armb", "arm_simple.S", "demo_arm_b.bin"])
+test_arml = ExampleShellcode(["arml", "arm_simple.S", "demo_arm_l.bin"])
+test_armtb = ExampleShellcode(["armtb", "armt.S", "demo_armt_b.bin"])
+test_armtl = ExampleShellcode(["armtl", "armt.S", "demo_armt_l.bin"])
 test_msp430 = ExampleShellcode(["msp430", "msp430.S", "msp430_sc.bin"])
 test_mips32b = ExampleShellcode(["mips32b", "mips32.S", "mips32_sc_b.bin"])
 test_mips32l = ExampleShellcode(["mips32l", "mips32.S", "mips32_sc_l.bin"])
+test_x86_64 = ExampleShellcode(["x86_64", "x86_64.S", "demo_x86_64.bin",
+                                "--PE"])
 
 testset += test_armb
 testset += test_arml
@@ -142,7 +143,7 @@ testset += test_armtl
 testset += test_msp430
 testset += test_mips32b
 testset += test_mips32l
-
+testset += test_x86_64
 
 class ExampleDisassembler(Example):
     """Disassembler examples specificities:
@@ -188,6 +189,8 @@ testset += ExampleDisasmFull(["mips32l", Example.get_sample("mips32_sc_l.bin"),
                               "0"], depends=[test_mips32l])
 testset += ExampleDisasmFull(["mips32b", Example.get_sample("mips32_sc_b.bin"),
                               "0"], depends=[test_mips32b])
+testset += ExampleDisasmFull(["x86_64", Example.get_sample("demo_x86_64.bin"),
+                              "0x401000"], depends=[test_x86_64])
 
 
 ## Expression