Reorganize test directories

2015-09-21 20:47:45 -05:00 · 2015-09-21 20:47:45 -05:00 · 3c1d65ea66
commit 3c1d65ea66
parent 0c67f41ed9
43 changed files with 2 additions and 2 deletions
--- a/2
+++ b/2
@ -251,7 +251,7 @@ endif

 .PHONY: test
 test: all
-	$(MAKE) -C test/unit test
+	$(MAKE) -C tests/unit test


 install: all $(PKGCFGF)
--- a/tests/regress/Makefile
+++ b/tests/regress/Makefile
--- a/tests/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)

--- a/tests/regress/arm_movr12_hang.py
+++ b/tests/regress/arm_movr12_hang.py
--- a/tests/regress/block_test.c
+++ b/tests/regress/block_test.c
--- a/tests/regress/callback-pc.py
+++ b/tests/regress/callback-pc.py
--- a/tests/regress/crash_tb.py
+++ b/tests/regress/crash_tb.py
--- a/tests/regress/deadlock_1.py
+++ b/tests/regress/deadlock_1.py
--- a/tests/regress/emu_stop_segfault.py
+++ b/tests/regress/emu_stop_segfault.py
--- a/tests/regress/fpu_ip.py
+++ b/tests/regress/fpu_ip.py
--- a/tests/regress/fpu_mem_write.py
+++ b/tests/regress/fpu_mem_write.py
--- a/tests/regress/hang.py
+++ b/tests/regress/hang.py
--- a/tests/regress/jmp_ebx_hang.py
+++ b/tests/regress/jmp_ebx_hang.py
--- a/tests/regress/map_crash.c
+++ b/tests/regress/map_crash.c
--- a/tests/regress/map_write.c
+++ b/tests/regress/map_write.c
--- a/tests/regress/mem_exec.c
+++ b/tests/regress/mem_exec.c
--- a/tests/regress/mem_protect.c
+++ b/tests/regress/mem_protect.c
--- a/tests/regress/mem_unmap.c
+++ b/tests/regress/mem_unmap.c
--- a/tests/regress/memmap.py
+++ b/tests/regress/memmap.py
--- a/tests/regress/memmap_segfault.py
+++ b/tests/regress/memmap_segfault.py
--- a/tests/regress/mips_branch_delay.py
+++ b/tests/regress/mips_branch_delay.py
--- a/tests/regress/mips_except.py
+++ b/tests/regress/mips_except.py
--- a/tests/regress/movsd.py
+++ b/tests/regress/movsd.py
--- a/tests/regress/nr_mem_test.c
+++ b/tests/regress/nr_mem_test.c
--- a/tests/regress/pshufb.py
+++ b/tests/regress/pshufb.py
--- a/tests/regress/reg_write_sign_extension.py
+++ b/tests/regress/reg_write_sign_extension.py
--- a/tests/regress/regress.py
+++ b/tests/regress/regress.py
--- a/tests/regress/rep_movsb.c
+++ b/tests/regress/rep_movsb.c
--- a/tests/regress/ro_mem_test.c
+++ b/tests/regress/ro_mem_test.c
--- a/tests/regress/sigill.c
+++ b/tests/regress/sigill.c
--- a/tests/regress/sigill2.c
+++ b/tests/regress/sigill2.c
--- a/tests/regress/sparc64.py
+++ b/tests/regress/sparc64.py
--- a/tests/regress/sparc_reg.py
+++ b/tests/regress/sparc_reg.py
--- a/tests/regress/timeout_segfault.c
+++ b/tests/regress/timeout_segfault.c
--- a/tests/regress/wrong_rip.py
+++ b/tests/regress/wrong_rip.py
--- a/tests/regress/wrong_rip_arm.py
+++ b/tests/regress/wrong_rip_arm.py
--- a/tests/regress/wrong_sp_arm.py
+++ b/tests/regress/wrong_sp_arm.py
--- a/tests/unit/.gitignore
+++ b/tests/unit/.gitignore
--- a/tests/unit/Makefile
+++ b/tests/unit/Makefile
--- a/tests/unit/test_mem_map.c
+++ b/tests/unit/test_mem_map.c
--- a/tests/unit/test_sanity.c
+++ b/tests/unit/test_sanity.c
--- a/tests/unit/test_x86.c
+++ b/tests/unit/test_x86.c
--- a/tests/unit/unicorn_test.h
+++ b/tests/unit/unicorn_test.h