diff options
Diffstat (limited to 'test/test_all.py')
| -rwxr-xr-x | test/test_all.py | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/test/test_all.py b/test/test_all.py index 7fb43525..71eccc6f 100755 --- a/test/test_all.py +++ b/test/test_all.py @@ -17,6 +17,7 @@ from utils import cosmetics, multithread from multiprocessing import Queue is_win = platform.system() == "Windows" +is_64bit = platform.architecture()[0] == "64bit" testset = TestSet("../") TAGS = {"regression": "REGRESSION", # Regression tests @@ -112,7 +113,7 @@ for script in ["x86/sem.py", if jitter in blacklist.get(script, []): continue tags = [TAGS[jitter]] if jitter in TAGS else [] - if is_win and script.endswith("mn_div.py"): + if (not is_64bit) and script.endswith("mn_div.py"): continue testset += ArchUnitTest(script, jitter, base_dir="arch", tags=tags) @@ -548,6 +549,13 @@ test_x86_32_if_reg = ExampleShellcode(['x86_32', 'x86_32_if_reg.S', "x86_32_if_r test_x86_32_seh = ExampleShellcode(["x86_32", "x86_32_seh.S", "x86_32_seh.bin", "--PE"]) test_x86_32_dead = ExampleShellcode(['x86_32', 'x86_32_dead.S', "x86_32_dead.bin"]) +test_x86_32_automod_2 = ExampleShellcode( + [ + 'x86_32', 'x86_32_automod_2.S', "x86_32_automod_2.bin", "--PE" + ] +) + + test_x86_32_dis = ExampleShellcode( [ "x86_32", "test_x86_32_dis.S", "test_x86_32_dis.bin", "--PE" @@ -573,6 +581,7 @@ testset += test_x86_32_seh testset += test_x86_32_dead testset += test_human testset += test_x86_32_dis +testset += test_x86_32_automod_2 class ExampleDisassembler(Example): """Disassembler examples specificities: @@ -801,6 +810,8 @@ for script, dep in [(["x86_32.py", Example.get_sample("x86_32_sc.bin")], []), (["arm_sc.py", "0", Example.get_sample("demo_arm_l.bin"), "l", "-a", "0"], [test_arml]), (["sandbox_call.py", Example.get_sample("md5_arm")], []), + (["sandbox_pe_x86_32.py", Example.get_sample("x86_32_automod_2.bin")], + [test_x86_32_automod_2]) ] + [(["sandbox_pe_x86_32.py", Example.get_sample("x86_32_" + name + ".bin")], [test_box[name]]) |