diff options
| -rw-r--r-- | example/asm/arm.py (renamed from example/asm_arm.py) | 0 | ||||
| -rw-r--r-- | example/asm/arm_sc.py (renamed from example/asm_arm_sc.py) | 0 | ||||
| -rw-r--r-- | example/asm/armt.py (renamed from example/asm_armt.py) | 0 | ||||
| -rw-r--r-- | example/asm/box_x86_32.py (renamed from example/asm_box_x86_32.py) | 0 | ||||
| -rw-r--r-- | example/asm/box_x86_32_enc.py (renamed from example/asm_box_x86_32_enc.py) | 0 | ||||
| -rw-r--r-- | example/asm/box_x86_64.py (renamed from example/asm_box_x86_64.py) | 0 | ||||
| -rw-r--r-- | example/asm/mips32.py (renamed from example/asm_mips32.py) | 0 | ||||
| -rw-r--r-- | example/asm/msp430_sc.py (renamed from example/asm_msp430_sc.py) | 0 | ||||
| -rw-r--r-- | example/asm/x86.py (renamed from example/asm_x86.py) | 0 | ||||
| -rw-r--r-- | test/test_all.py | 33 |
10 files changed, 20 insertions, 13 deletions
diff --git a/example/asm_arm.py b/example/asm/arm.py index 28af59fb..28af59fb 100644 --- a/example/asm_arm.py +++ b/example/asm/arm.py diff --git a/example/asm_arm_sc.py b/example/asm/arm_sc.py index 83787f02..83787f02 100644 --- a/example/asm_arm_sc.py +++ b/example/asm/arm_sc.py diff --git a/example/asm_armt.py b/example/asm/armt.py index f4ce6d2d..f4ce6d2d 100644 --- a/example/asm_armt.py +++ b/example/asm/armt.py diff --git a/example/asm_box_x86_32.py b/example/asm/box_x86_32.py index def7af99..def7af99 100644 --- a/example/asm_box_x86_32.py +++ b/example/asm/box_x86_32.py diff --git a/example/asm_box_x86_32_enc.py b/example/asm/box_x86_32_enc.py index ec4d70ea..ec4d70ea 100644 --- a/example/asm_box_x86_32_enc.py +++ b/example/asm/box_x86_32_enc.py diff --git a/example/asm_box_x86_64.py b/example/asm/box_x86_64.py index 44aca56e..44aca56e 100644 --- a/example/asm_box_x86_64.py +++ b/example/asm/box_x86_64.py diff --git a/example/asm_mips32.py b/example/asm/mips32.py index fc050f1f..fc050f1f 100644 --- a/example/asm_mips32.py +++ b/example/asm/mips32.py diff --git a/example/asm_msp430_sc.py b/example/asm/msp430_sc.py index de488803..de488803 100644 --- a/example/asm_msp430_sc.py +++ b/example/asm/msp430_sc.py diff --git a/example/asm_x86.py b/example/asm/x86.py index d877ceaa..d877ceaa 100644 --- a/example/asm_x86.py +++ b/example/asm/x86.py diff --git a/test/test_all.py b/test/test_all.py index 55eead73..0bd6ccb3 100644 --- a/test/test_all.py +++ b/test/test_all.py @@ -102,25 +102,32 @@ class ExampleDir(Example): ## Assembler -testset += Example(['asm_x86.py'], products=["demo_x86_32.bin"]) -test_arm = Example(["asm_arm.py"], products=["demo_arm_l.bin", "demo_arm_b.bin"]) -test_armt = Example(["asm_armt.py"], products=["demo_armt_l.bin", - "demo_armt_b.bin"]) +class ExampleAssembler(ExampleDir): + """Assembler examples specificities: + - script path begins with "asm/" + """ + example_dir = "asm" + + +testset += ExampleAssembler(['x86.py'], products=["demo_x86_32.bin"]) +test_arm = ExampleAssembler(["arm.py"], + products=["demo_arm_l.bin", "demo_arm_b.bin"]) +test_armt = ExampleAssembler(["armt.py"], products=["demo_armt_l.bin", + "demo_armt_b.bin"]) test_box = {} test_box_names = ["mod", "mod_self", "repmod", "simple"] for source in test_box_names: - test_box[source] = Example(["asm_box_x86_32.py", - Example.get_sample("x86_32_" + source + ".S")], - products=[Example.get_sample("x86_32_" + source + - ".bin")]) + sample_base = Example.get_sample("x86_32_" + source) + test_box[source] = ExampleAssembler(["box_x86_32.py", sample_base + ".S"], + products=[sample_base + ".bin"]) testset += test_box[source] -test_box_enc = Example(["asm_box_x86_32_enc.py"], - products=["box_x86_32_enc.bin"]) -test_msp430 = Example(["asm_msp430_sc.py"], products=["msp430_sc.bin"]) -test_mips32 = Example(["asm_mips32.py"], products=["mips32_sc_b.bin", - "mips32_sc_l.bin"]) +test_box_enc = ExampleAssembler(["box_x86_32_enc.py"], + products=["box_x86_32_enc.bin"]) +test_msp430 = ExampleAssembler(["msp430_sc.py"], products=["msp430_sc.bin"]) +test_mips32 = ExampleAssembler(["mips32.py"], products=["mips32_sc_b.bin", + "mips32_sc_l.bin"]) testset += test_arm testset += test_armt |