diff --git a/Makefile b/Makefile index 198ed266..ce4b0d94 100644 --- a/Makefile +++ b/Makefile @@ -251,7 +251,7 @@ endif .PHONY: test test: all - $(MAKE) -C test/unit test + $(MAKE) -C tests/unit test install: all $(PKGCFGF) diff --git a/regress/Makefile b/tests/regress/Makefile similarity index 100% rename from regress/Makefile rename to tests/regress/Makefile diff --git a/regress/arm_bxeq_hang.py b/tests/regress/arm_bxeq_hang.py similarity index 92% rename from regress/arm_bxeq_hang.py rename to tests/regress/arm_bxeq_hang.py index b696112a..12f4a2ae 100755 --- a/regress/arm_bxeq_hang.py +++ b/tests/regress/arm_bxeq_hang.py @@ -19,7 +19,7 @@ class BxHang(regress.RegressTest): uc.reg_write(UC_ARM_REG_LR, 0x1004) uc.hook_add(UC_HOOK_BLOCK, hook_block) print 'block should only run once' - uc.emu_start(0x1000, 0x1004, timeout=500) + uc.emu_start(0x1000, 0x1004) self.assertEqual(uc.count, 1) diff --git a/regress/arm_movr12_hang.py b/tests/regress/arm_movr12_hang.py similarity index 100% rename from regress/arm_movr12_hang.py rename to tests/regress/arm_movr12_hang.py diff --git a/regress/block_test.c b/tests/regress/block_test.c similarity index 100% rename from regress/block_test.c rename to tests/regress/block_test.c diff --git a/regress/callback-pc.py b/tests/regress/callback-pc.py similarity index 100% rename from regress/callback-pc.py rename to tests/regress/callback-pc.py diff --git a/regress/crash_tb.py b/tests/regress/crash_tb.py similarity index 100% rename from regress/crash_tb.py rename to tests/regress/crash_tb.py diff --git a/regress/deadlock_1.py b/tests/regress/deadlock_1.py similarity index 100% rename from regress/deadlock_1.py rename to tests/regress/deadlock_1.py diff --git a/regress/emu_stop_segfault.py b/tests/regress/emu_stop_segfault.py similarity index 100% rename from regress/emu_stop_segfault.py rename to tests/regress/emu_stop_segfault.py diff --git a/regress/fpu_ip.py b/tests/regress/fpu_ip.py similarity index 100% rename from regress/fpu_ip.py rename to tests/regress/fpu_ip.py diff --git a/regress/fpu_mem_write.py b/tests/regress/fpu_mem_write.py similarity index 100% rename from regress/fpu_mem_write.py rename to tests/regress/fpu_mem_write.py diff --git a/regress/hang.py b/tests/regress/hang.py similarity index 100% rename from regress/hang.py rename to tests/regress/hang.py diff --git a/regress/jmp_ebx_hang.py b/tests/regress/jmp_ebx_hang.py similarity index 100% rename from regress/jmp_ebx_hang.py rename to tests/regress/jmp_ebx_hang.py diff --git a/regress/map_crash.c b/tests/regress/map_crash.c similarity index 100% rename from regress/map_crash.c rename to tests/regress/map_crash.c diff --git a/regress/map_write.c b/tests/regress/map_write.c similarity index 100% rename from regress/map_write.c rename to tests/regress/map_write.c diff --git a/regress/mem_exec.c b/tests/regress/mem_exec.c similarity index 100% rename from regress/mem_exec.c rename to tests/regress/mem_exec.c diff --git a/regress/mem_protect.c b/tests/regress/mem_protect.c similarity index 100% rename from regress/mem_protect.c rename to tests/regress/mem_protect.c diff --git a/regress/mem_unmap.c b/tests/regress/mem_unmap.c similarity index 100% rename from regress/mem_unmap.c rename to tests/regress/mem_unmap.c diff --git a/regress/memmap.py b/tests/regress/memmap.py similarity index 100% rename from regress/memmap.py rename to tests/regress/memmap.py diff --git a/regress/memmap_segfault.py b/tests/regress/memmap_segfault.py similarity index 100% rename from regress/memmap_segfault.py rename to tests/regress/memmap_segfault.py diff --git a/regress/mips_branch_delay.py b/tests/regress/mips_branch_delay.py similarity index 100% rename from regress/mips_branch_delay.py rename to tests/regress/mips_branch_delay.py diff --git a/regress/mips_except.py b/tests/regress/mips_except.py similarity index 100% rename from regress/mips_except.py rename to tests/regress/mips_except.py diff --git a/regress/movsd.py b/tests/regress/movsd.py similarity index 100% rename from regress/movsd.py rename to tests/regress/movsd.py diff --git a/regress/nr_mem_test.c b/tests/regress/nr_mem_test.c similarity index 100% rename from regress/nr_mem_test.c rename to tests/regress/nr_mem_test.c diff --git a/regress/pshufb.py b/tests/regress/pshufb.py similarity index 100% rename from regress/pshufb.py rename to tests/regress/pshufb.py diff --git a/regress/reg_write_sign_extension.py b/tests/regress/reg_write_sign_extension.py similarity index 100% rename from regress/reg_write_sign_extension.py rename to tests/regress/reg_write_sign_extension.py diff --git a/regress/regress.py b/tests/regress/regress.py similarity index 100% rename from regress/regress.py rename to tests/regress/regress.py diff --git a/regress/rep_movsb.c b/tests/regress/rep_movsb.c similarity index 100% rename from regress/rep_movsb.c rename to tests/regress/rep_movsb.c diff --git a/regress/ro_mem_test.c b/tests/regress/ro_mem_test.c similarity index 100% rename from regress/ro_mem_test.c rename to tests/regress/ro_mem_test.c diff --git a/regress/sigill.c b/tests/regress/sigill.c similarity index 100% rename from regress/sigill.c rename to tests/regress/sigill.c diff --git a/regress/sigill2.c b/tests/regress/sigill2.c similarity index 100% rename from regress/sigill2.c rename to tests/regress/sigill2.c diff --git a/regress/sparc64.py b/tests/regress/sparc64.py similarity index 100% rename from regress/sparc64.py rename to tests/regress/sparc64.py diff --git a/regress/sparc_reg.py b/tests/regress/sparc_reg.py similarity index 100% rename from regress/sparc_reg.py rename to tests/regress/sparc_reg.py diff --git a/regress/timeout_segfault.c b/tests/regress/timeout_segfault.c similarity index 100% rename from regress/timeout_segfault.c rename to tests/regress/timeout_segfault.c diff --git a/regress/wrong_rip.py b/tests/regress/wrong_rip.py similarity index 100% rename from regress/wrong_rip.py rename to tests/regress/wrong_rip.py diff --git a/regress/wrong_rip_arm.py b/tests/regress/wrong_rip_arm.py similarity index 100% rename from regress/wrong_rip_arm.py rename to tests/regress/wrong_rip_arm.py diff --git a/regress/wrong_sp_arm.py b/tests/regress/wrong_sp_arm.py similarity index 100% rename from regress/wrong_sp_arm.py rename to tests/regress/wrong_sp_arm.py diff --git a/test/unit/.gitignore b/tests/unit/.gitignore similarity index 100% rename from test/unit/.gitignore rename to tests/unit/.gitignore diff --git a/test/unit/Makefile b/tests/unit/Makefile similarity index 100% rename from test/unit/Makefile rename to tests/unit/Makefile diff --git a/test/unit/test_mem_map.c b/tests/unit/test_mem_map.c similarity index 100% rename from test/unit/test_mem_map.c rename to tests/unit/test_mem_map.c diff --git a/test/unit/test_sanity.c b/tests/unit/test_sanity.c similarity index 100% rename from test/unit/test_sanity.c rename to tests/unit/test_sanity.c diff --git a/test/unit/test_x86.c b/tests/unit/test_x86.c similarity index 100% rename from test/unit/test_x86.c rename to tests/unit/test_x86.c diff --git a/test/unit/unicorn_test.h b/tests/unit/unicorn_test.h similarity index 100% rename from test/unit/unicorn_test.h rename to tests/unit/unicorn_test.h