From ca0bee23774e6855f9b8efbc486d6aeeeba53811 Mon Sep 17 00:00:00 2001 From: JP Smith Date: Mon, 13 Mar 2017 14:06:36 -0500 Subject: [PATCH] Rename test -> tests (#66) * rename test -> tests * re-add ignored tests --- README.md | 6 +++--- scripts/travis_test.sh | 2 +- {test => tests}/__init__.py | 0 {test => tests}/auto/README | 0 {test => tests}/auto/flags.py | 0 {test => tests}/auto/make_dump.py | 0 {test => tests}/auto/make_tests.py | 0 {test => tests}/auto/trace.py | 0 {test => tests}/binaries/arguments | Bin {test => tests}/binaries/arguments_linux_amd64 | Bin {test => tests}/binaries/arguments_linux_armv7 | Bin {test => tests}/binaries/basic_linux_amd64 | Bin {test => tests}/binaries/cadet_decree_x86 | Bin .../memdumps/api_interception/README.txt | 0 .../memdumps/api_interception/api_interception.cpp | 0 .../memdumps/api_interception/api_interception.dmp | Bin .../api_interception_test_visited.txt | 0 .../memdumps/api_interception/api_names.txt | 0 {test => tests}/memdumps/api_interception/args.json | 0 {test => tests}/memdumps/follow_trace/README | 0 .../follow_trace/simple_buffer_overflow.dmp | Bin {test => tests}/memdumps/ignore_an_api/README.txt | 2 +- .../memdumps/ignore_an_api/api_names.txt | 0 .../memdumps/ignore_an_api/ignore_an_api.cpp | 0 .../memdumps/ignore_an_api/ignore_an_api.dmp | Bin {test => tests}/memdumps/index_code/README | 0 {test => tests}/memdumps/index_code/index_code.c | 0 {test => tests}/memdumps/index_code/index_code.dmp | Bin {test => tests}/memdumps/index_data/README | 0 {test => tests}/memdumps/index_data/index_data.c | 0 {test => tests}/memdumps/index_data/index_data.dmp | Bin .../memdumps/linux_palindrome/Palindrome | Bin .../memdumps/linux_palindrome/README.txt | 0 .../memdumps/linux_palindrome/api_names.txt | 0 {test => tests}/memdumps/many_ifs/README | 0 {test => tests}/memdumps/many_ifs/assertions.txt | 0 {test => tests}/memdumps/many_ifs/many_ifs.c | 0 {test => tests}/memdumps/many_ifs/many_ifs.dmp | Bin {test => tests}/memdumps/many_ifs/many_ifs.exe | Bin {test => tests}/memdumps/simple_bad_deref/README | 0 {test => tests}/memdumps/simple_bad_deref/args.json | 0 .../memdumps/simple_bad_deref/simple_bad_deref.c | 0 .../memdumps/simple_bad_deref/simple_bad_deref.dmp | Bin .../simple_bad_deref/simple_bad_deref_visited.txt | 0 .../memdumps/simple_buffer_overflow/README | 0 .../memdumps/simple_buffer_overflow/args.json | 0 .../memdumps/simple_buffer_overflow/sbo_visited.txt | 0 .../simple_buffer_overflow.cpp | 0 .../simple_buffer_overflow.dmp | Bin {test => tests}/memdumps/simple_fpu/README | 0 {test => tests}/memdumps/simple_fpu/args.json | 0 {test => tests}/memdumps/simple_fpu/simple_fpu.c | 0 {test => tests}/memdumps/simple_fpu/simple_fpu.dmp | Bin {test => tests}/memdumps/simple_parse/README | 0 {test => tests}/memdumps/simple_parse/args.json | 0 .../memdumps/simple_parse/simple_parse.c | 0 .../memdumps/simple_parse/simple_parse.dmp | Bin .../memdumps/simple_parse/simple_parse_visited.txt | 0 {test => tests}/memdumps/win32_api_test/README.txt | 0 .../memdumps/win32_api_test/api_names.txt | 0 {test => tests}/memdumps/win32_api_test/args.json | 0 .../memdumps/win32_api_test/win32_api_test.c | 0 .../memdumps/win32_api_test/win32_api_test.dmp | Bin .../win32_api_test/win32_api_test_visited.txt | 0 {test => tests}/mockmem.py | 0 {test => tests}/test_allinsts.py | 0 {test => tests}/test_armv7_bitwise.py | 0 {test => tests}/test_armv7cpu.py | 0 {test => tests}/test_armv7rf.py | 0 {test => tests}/test_binaries.py | 0 {test => tests}/test_cpu_automatic.py | 0 {test => tests}/test_cpu_manual.py | 0 {test => tests}/test_driver.py | 0 {test => tests}/test_linux.py | 0 {test => tests}/test_manticore.py | 4 ++-- {test => tests}/test_memdumps.py | 0 {test => tests}/test_memory.py | 0 {test => tests}/test_register.py | 0 {test => tests}/test_signal.py | 0 {test => tests}/test_smtlibv2.py | 0 {test => tests}/test_state.py | 0 81 files changed, 7 insertions(+), 7 deletions(-) rename {test => tests}/__init__.py (100%) rename {test => tests}/auto/README (100%) rename {test => tests}/auto/flags.py (100%) rename {test => tests}/auto/make_dump.py (100%) rename {test => tests}/auto/make_tests.py (100%) rename {test => tests}/auto/trace.py (100%) rename {test => tests}/binaries/arguments (100%) rename {test => tests}/binaries/arguments_linux_amd64 (100%) rename {test => tests}/binaries/arguments_linux_armv7 (100%) rename {test => tests}/binaries/basic_linux_amd64 (100%) rename {test => tests}/binaries/cadet_decree_x86 (100%) rename {test => tests}/memdumps/api_interception/README.txt (100%) rename {test => tests}/memdumps/api_interception/api_interception.cpp (100%) rename {test => tests}/memdumps/api_interception/api_interception.dmp (100%) rename {test => tests}/memdumps/api_interception/api_interception_test_visited.txt (100%) rename {test => tests}/memdumps/api_interception/api_names.txt (100%) rename {test => tests}/memdumps/api_interception/args.json (100%) rename {test => tests}/memdumps/follow_trace/README (100%) rename {test => tests}/memdumps/follow_trace/simple_buffer_overflow.dmp (100%) rename {test => tests}/memdumps/ignore_an_api/README.txt (96%) rename {test => tests}/memdumps/ignore_an_api/api_names.txt (100%) rename {test => tests}/memdumps/ignore_an_api/ignore_an_api.cpp (100%) rename {test => tests}/memdumps/ignore_an_api/ignore_an_api.dmp (100%) rename {test => tests}/memdumps/index_code/README (100%) rename {test => tests}/memdumps/index_code/index_code.c (100%) rename {test => tests}/memdumps/index_code/index_code.dmp (100%) rename {test => tests}/memdumps/index_data/README (100%) rename {test => tests}/memdumps/index_data/index_data.c (100%) rename {test => tests}/memdumps/index_data/index_data.dmp (100%) rename {test => tests}/memdumps/linux_palindrome/Palindrome (100%) rename {test => tests}/memdumps/linux_palindrome/README.txt (100%) rename {test => tests}/memdumps/linux_palindrome/api_names.txt (100%) rename {test => tests}/memdumps/many_ifs/README (100%) rename {test => tests}/memdumps/many_ifs/assertions.txt (100%) rename {test => tests}/memdumps/many_ifs/many_ifs.c (100%) rename {test => tests}/memdumps/many_ifs/many_ifs.dmp (100%) rename {test => tests}/memdumps/many_ifs/many_ifs.exe (100%) rename {test => tests}/memdumps/simple_bad_deref/README (100%) rename {test => tests}/memdumps/simple_bad_deref/args.json (100%) rename {test => tests}/memdumps/simple_bad_deref/simple_bad_deref.c (100%) rename {test => tests}/memdumps/simple_bad_deref/simple_bad_deref.dmp (100%) rename {test => tests}/memdumps/simple_bad_deref/simple_bad_deref_visited.txt (100%) rename {test => tests}/memdumps/simple_buffer_overflow/README (100%) rename {test => tests}/memdumps/simple_buffer_overflow/args.json (100%) rename {test => tests}/memdumps/simple_buffer_overflow/sbo_visited.txt (100%) rename {test => tests}/memdumps/simple_buffer_overflow/simple_buffer_overflow.cpp (100%) rename {test => tests}/memdumps/simple_buffer_overflow/simple_buffer_overflow.dmp (100%) rename {test => tests}/memdumps/simple_fpu/README (100%) rename {test => tests}/memdumps/simple_fpu/args.json (100%) rename {test => tests}/memdumps/simple_fpu/simple_fpu.c (100%) rename {test => tests}/memdumps/simple_fpu/simple_fpu.dmp (100%) rename {test => tests}/memdumps/simple_parse/README (100%) rename {test => tests}/memdumps/simple_parse/args.json (100%) rename {test => tests}/memdumps/simple_parse/simple_parse.c (100%) rename {test => tests}/memdumps/simple_parse/simple_parse.dmp (100%) rename {test => tests}/memdumps/simple_parse/simple_parse_visited.txt (100%) rename {test => tests}/memdumps/win32_api_test/README.txt (100%) rename {test => tests}/memdumps/win32_api_test/api_names.txt (100%) rename {test => tests}/memdumps/win32_api_test/args.json (100%) rename {test => tests}/memdumps/win32_api_test/win32_api_test.c (100%) rename {test => tests}/memdumps/win32_api_test/win32_api_test.dmp (100%) rename {test => tests}/memdumps/win32_api_test/win32_api_test_visited.txt (100%) rename {test => tests}/mockmem.py (100%) rename {test => tests}/test_allinsts.py (100%) rename {test => tests}/test_armv7_bitwise.py (100%) rename {test => tests}/test_armv7cpu.py (100%) rename {test => tests}/test_armv7rf.py (100%) rename {test => tests}/test_binaries.py (100%) rename {test => tests}/test_cpu_automatic.py (100%) rename {test => tests}/test_cpu_manual.py (100%) rename {test => tests}/test_driver.py (100%) rename {test => tests}/test_linux.py (100%) rename {test => tests}/test_manticore.py (91%) rename {test => tests}/test_memdumps.py (100%) rename {test => tests}/test_memory.py (100%) rename {test => tests}/test_register.py (100%) rename {test => tests}/test_signal.py (100%) rename {test => tests}/test_smtlibv2.py (100%) rename {test => tests}/test_state.py (100%) diff --git a/README.md b/README.md index a55a3e6..31c4403 100644 --- a/README.md +++ b/README.md @@ -61,11 +61,11 @@ cd /path/to/manticore/ # all tests nosetests # just one file -nosetests test/test_armv7cpu.py +nosetests tests/test_armv7cpu.py # just one test class -nosetests test/test_armv7cpu.py:Armv7CpuInstructions +nosetests tests/test_armv7cpu.py:Armv7CpuInstructions # just one test -nosetests test/test_armv7cpu.py:Armv7CpuInstructions.test_mov_imm_min +nosetests tests/test_armv7cpu.py:Armv7CpuInstructions.test_mov_imm_min ``` ## Quick start diff --git a/scripts/travis_test.sh b/scripts/travis_test.sh index 5891d9a..3d557fc 100755 --- a/scripts/travis_test.sh +++ b/scripts/travis_test.sh @@ -1,6 +1,6 @@ #!/bin/bash coverage erase -coverage run -m unittest discover test/ 2>&1 >/dev/null | tee travis_tests.log +coverage run -m unittest discover tests/ 2>&1 >/dev/null | tee travis_tests.log DID_OK=$(tail -n1 travis_tests.log) RV=1 if [[ "${DID_OK}" == OK* ]] diff --git a/test/__init__.py b/tests/__init__.py similarity index 100% rename from test/__init__.py rename to tests/__init__.py diff --git a/test/auto/README b/tests/auto/README similarity index 100% rename from test/auto/README rename to tests/auto/README diff --git a/test/auto/flags.py b/tests/auto/flags.py similarity index 100% rename from test/auto/flags.py rename to tests/auto/flags.py diff --git a/test/auto/make_dump.py b/tests/auto/make_dump.py similarity index 100% rename from test/auto/make_dump.py rename to tests/auto/make_dump.py diff --git a/test/auto/make_tests.py b/tests/auto/make_tests.py similarity index 100% rename from test/auto/make_tests.py rename to tests/auto/make_tests.py diff --git a/test/auto/trace.py b/tests/auto/trace.py similarity index 100% rename from test/auto/trace.py rename to tests/auto/trace.py diff --git a/test/binaries/arguments b/tests/binaries/arguments similarity index 100% rename from test/binaries/arguments rename to tests/binaries/arguments diff --git a/test/binaries/arguments_linux_amd64 b/tests/binaries/arguments_linux_amd64 similarity index 100% rename from test/binaries/arguments_linux_amd64 rename to tests/binaries/arguments_linux_amd64 diff --git a/test/binaries/arguments_linux_armv7 b/tests/binaries/arguments_linux_armv7 similarity index 100% rename from test/binaries/arguments_linux_armv7 rename to tests/binaries/arguments_linux_armv7 diff --git a/test/binaries/basic_linux_amd64 b/tests/binaries/basic_linux_amd64 similarity index 100% rename from test/binaries/basic_linux_amd64 rename to tests/binaries/basic_linux_amd64 diff --git a/test/binaries/cadet_decree_x86 b/tests/binaries/cadet_decree_x86 similarity index 100% rename from test/binaries/cadet_decree_x86 rename to tests/binaries/cadet_decree_x86 diff --git a/test/memdumps/api_interception/README.txt b/tests/memdumps/api_interception/README.txt similarity index 100% rename from test/memdumps/api_interception/README.txt rename to tests/memdumps/api_interception/README.txt diff --git a/test/memdumps/api_interception/api_interception.cpp b/tests/memdumps/api_interception/api_interception.cpp similarity index 100% rename from test/memdumps/api_interception/api_interception.cpp rename to tests/memdumps/api_interception/api_interception.cpp diff --git a/test/memdumps/api_interception/api_interception.dmp b/tests/memdumps/api_interception/api_interception.dmp similarity index 100% rename from test/memdumps/api_interception/api_interception.dmp rename to tests/memdumps/api_interception/api_interception.dmp diff --git a/test/memdumps/api_interception/api_interception_test_visited.txt b/tests/memdumps/api_interception/api_interception_test_visited.txt similarity index 100% rename from test/memdumps/api_interception/api_interception_test_visited.txt rename to tests/memdumps/api_interception/api_interception_test_visited.txt diff --git a/test/memdumps/api_interception/api_names.txt b/tests/memdumps/api_interception/api_names.txt similarity index 100% rename from test/memdumps/api_interception/api_names.txt rename to tests/memdumps/api_interception/api_names.txt diff --git a/test/memdumps/api_interception/args.json b/tests/memdumps/api_interception/args.json similarity index 100% rename from test/memdumps/api_interception/args.json rename to tests/memdumps/api_interception/args.json diff --git a/test/memdumps/follow_trace/README b/tests/memdumps/follow_trace/README similarity index 100% rename from test/memdumps/follow_trace/README rename to tests/memdumps/follow_trace/README diff --git a/test/memdumps/follow_trace/simple_buffer_overflow.dmp b/tests/memdumps/follow_trace/simple_buffer_overflow.dmp similarity index 100% rename from test/memdumps/follow_trace/simple_buffer_overflow.dmp rename to tests/memdumps/follow_trace/simple_buffer_overflow.dmp diff --git a/test/memdumps/ignore_an_api/README.txt b/tests/memdumps/ignore_an_api/README.txt similarity index 96% rename from test/memdumps/ignore_an_api/README.txt rename to tests/memdumps/ignore_an_api/README.txt index caac177..5e0a90d 100644 --- a/test/memdumps/ignore_an_api/README.txt +++ b/tests/memdumps/ignore_an_api/README.txt @@ -5,7 +5,7 @@ No ignore APIs: python SymbolicExecutor/main.py --offset 0 --workspace test --buffer "DWORD PTR [EBP-0x28]" --size "0x20" tests/ignore_an_api/ignore_an_api.dmp Ignore APIs: -python SymbolicExecutor/main.py --offset 0 --workspace test --buffer "DWORD PTR [EBP-0x28]" --size "0x20" tests/ignore_an_api/ignore_an_api.dmp --names tests/ignore_an_api/api_names.txt --log test/manticore.log +python SymbolicExecutor/main.py --offset 0 --workspace test --buffer "DWORD PTR [EBP-0x28]" --size "0x20" tests/ignore_an_api/ignore_an_api.dmp --names tests/ignore_an_api/api_names.txt --log tests/manticore.log APIs to Ignore: diff --git a/test/memdumps/ignore_an_api/api_names.txt b/tests/memdumps/ignore_an_api/api_names.txt similarity index 100% rename from test/memdumps/ignore_an_api/api_names.txt rename to tests/memdumps/ignore_an_api/api_names.txt diff --git a/test/memdumps/ignore_an_api/ignore_an_api.cpp b/tests/memdumps/ignore_an_api/ignore_an_api.cpp similarity index 100% rename from test/memdumps/ignore_an_api/ignore_an_api.cpp rename to tests/memdumps/ignore_an_api/ignore_an_api.cpp diff --git a/test/memdumps/ignore_an_api/ignore_an_api.dmp b/tests/memdumps/ignore_an_api/ignore_an_api.dmp similarity index 100% rename from test/memdumps/ignore_an_api/ignore_an_api.dmp rename to tests/memdumps/ignore_an_api/ignore_an_api.dmp diff --git a/test/memdumps/index_code/README b/tests/memdumps/index_code/README similarity index 100% rename from test/memdumps/index_code/README rename to tests/memdumps/index_code/README diff --git a/test/memdumps/index_code/index_code.c b/tests/memdumps/index_code/index_code.c similarity index 100% rename from test/memdumps/index_code/index_code.c rename to tests/memdumps/index_code/index_code.c diff --git a/test/memdumps/index_code/index_code.dmp b/tests/memdumps/index_code/index_code.dmp similarity index 100% rename from test/memdumps/index_code/index_code.dmp rename to tests/memdumps/index_code/index_code.dmp diff --git a/test/memdumps/index_data/README b/tests/memdumps/index_data/README similarity index 100% rename from test/memdumps/index_data/README rename to tests/memdumps/index_data/README diff --git a/test/memdumps/index_data/index_data.c b/tests/memdumps/index_data/index_data.c similarity index 100% rename from test/memdumps/index_data/index_data.c rename to tests/memdumps/index_data/index_data.c diff --git a/test/memdumps/index_data/index_data.dmp b/tests/memdumps/index_data/index_data.dmp similarity index 100% rename from test/memdumps/index_data/index_data.dmp rename to tests/memdumps/index_data/index_data.dmp diff --git a/test/memdumps/linux_palindrome/Palindrome b/tests/memdumps/linux_palindrome/Palindrome similarity index 100% rename from test/memdumps/linux_palindrome/Palindrome rename to tests/memdumps/linux_palindrome/Palindrome diff --git a/test/memdumps/linux_palindrome/README.txt b/tests/memdumps/linux_palindrome/README.txt similarity index 100% rename from test/memdumps/linux_palindrome/README.txt rename to tests/memdumps/linux_palindrome/README.txt diff --git a/test/memdumps/linux_palindrome/api_names.txt b/tests/memdumps/linux_palindrome/api_names.txt similarity index 100% rename from test/memdumps/linux_palindrome/api_names.txt rename to tests/memdumps/linux_palindrome/api_names.txt diff --git a/test/memdumps/many_ifs/README b/tests/memdumps/many_ifs/README similarity index 100% rename from test/memdumps/many_ifs/README rename to tests/memdumps/many_ifs/README diff --git a/test/memdumps/many_ifs/assertions.txt b/tests/memdumps/many_ifs/assertions.txt similarity index 100% rename from test/memdumps/many_ifs/assertions.txt rename to tests/memdumps/many_ifs/assertions.txt diff --git a/test/memdumps/many_ifs/many_ifs.c b/tests/memdumps/many_ifs/many_ifs.c similarity index 100% rename from test/memdumps/many_ifs/many_ifs.c rename to tests/memdumps/many_ifs/many_ifs.c diff --git a/test/memdumps/many_ifs/many_ifs.dmp b/tests/memdumps/many_ifs/many_ifs.dmp similarity index 100% rename from test/memdumps/many_ifs/many_ifs.dmp rename to tests/memdumps/many_ifs/many_ifs.dmp diff --git a/test/memdumps/many_ifs/many_ifs.exe b/tests/memdumps/many_ifs/many_ifs.exe similarity index 100% rename from test/memdumps/many_ifs/many_ifs.exe rename to tests/memdumps/many_ifs/many_ifs.exe diff --git a/test/memdumps/simple_bad_deref/README b/tests/memdumps/simple_bad_deref/README similarity index 100% rename from test/memdumps/simple_bad_deref/README rename to tests/memdumps/simple_bad_deref/README diff --git a/test/memdumps/simple_bad_deref/args.json b/tests/memdumps/simple_bad_deref/args.json similarity index 100% rename from test/memdumps/simple_bad_deref/args.json rename to tests/memdumps/simple_bad_deref/args.json diff --git a/test/memdumps/simple_bad_deref/simple_bad_deref.c b/tests/memdumps/simple_bad_deref/simple_bad_deref.c similarity index 100% rename from test/memdumps/simple_bad_deref/simple_bad_deref.c rename to tests/memdumps/simple_bad_deref/simple_bad_deref.c diff --git a/test/memdumps/simple_bad_deref/simple_bad_deref.dmp b/tests/memdumps/simple_bad_deref/simple_bad_deref.dmp similarity index 100% rename from test/memdumps/simple_bad_deref/simple_bad_deref.dmp rename to tests/memdumps/simple_bad_deref/simple_bad_deref.dmp diff --git a/test/memdumps/simple_bad_deref/simple_bad_deref_visited.txt b/tests/memdumps/simple_bad_deref/simple_bad_deref_visited.txt similarity index 100% rename from test/memdumps/simple_bad_deref/simple_bad_deref_visited.txt rename to tests/memdumps/simple_bad_deref/simple_bad_deref_visited.txt diff --git a/test/memdumps/simple_buffer_overflow/README b/tests/memdumps/simple_buffer_overflow/README similarity index 100% rename from test/memdumps/simple_buffer_overflow/README rename to tests/memdumps/simple_buffer_overflow/README diff --git a/test/memdumps/simple_buffer_overflow/args.json b/tests/memdumps/simple_buffer_overflow/args.json similarity index 100% rename from test/memdumps/simple_buffer_overflow/args.json rename to tests/memdumps/simple_buffer_overflow/args.json diff --git a/test/memdumps/simple_buffer_overflow/sbo_visited.txt b/tests/memdumps/simple_buffer_overflow/sbo_visited.txt similarity index 100% rename from test/memdumps/simple_buffer_overflow/sbo_visited.txt rename to tests/memdumps/simple_buffer_overflow/sbo_visited.txt diff --git a/test/memdumps/simple_buffer_overflow/simple_buffer_overflow.cpp b/tests/memdumps/simple_buffer_overflow/simple_buffer_overflow.cpp similarity index 100% rename from test/memdumps/simple_buffer_overflow/simple_buffer_overflow.cpp rename to tests/memdumps/simple_buffer_overflow/simple_buffer_overflow.cpp diff --git a/test/memdumps/simple_buffer_overflow/simple_buffer_overflow.dmp b/tests/memdumps/simple_buffer_overflow/simple_buffer_overflow.dmp similarity index 100% rename from test/memdumps/simple_buffer_overflow/simple_buffer_overflow.dmp rename to tests/memdumps/simple_buffer_overflow/simple_buffer_overflow.dmp diff --git a/test/memdumps/simple_fpu/README b/tests/memdumps/simple_fpu/README similarity index 100% rename from test/memdumps/simple_fpu/README rename to tests/memdumps/simple_fpu/README diff --git a/test/memdumps/simple_fpu/args.json b/tests/memdumps/simple_fpu/args.json similarity index 100% rename from test/memdumps/simple_fpu/args.json rename to tests/memdumps/simple_fpu/args.json diff --git a/test/memdumps/simple_fpu/simple_fpu.c b/tests/memdumps/simple_fpu/simple_fpu.c similarity index 100% rename from test/memdumps/simple_fpu/simple_fpu.c rename to tests/memdumps/simple_fpu/simple_fpu.c diff --git a/test/memdumps/simple_fpu/simple_fpu.dmp b/tests/memdumps/simple_fpu/simple_fpu.dmp similarity index 100% rename from test/memdumps/simple_fpu/simple_fpu.dmp rename to tests/memdumps/simple_fpu/simple_fpu.dmp diff --git a/test/memdumps/simple_parse/README b/tests/memdumps/simple_parse/README similarity index 100% rename from test/memdumps/simple_parse/README rename to tests/memdumps/simple_parse/README diff --git a/test/memdumps/simple_parse/args.json b/tests/memdumps/simple_parse/args.json similarity index 100% rename from test/memdumps/simple_parse/args.json rename to tests/memdumps/simple_parse/args.json diff --git a/test/memdumps/simple_parse/simple_parse.c b/tests/memdumps/simple_parse/simple_parse.c similarity index 100% rename from test/memdumps/simple_parse/simple_parse.c rename to tests/memdumps/simple_parse/simple_parse.c diff --git a/test/memdumps/simple_parse/simple_parse.dmp b/tests/memdumps/simple_parse/simple_parse.dmp similarity index 100% rename from test/memdumps/simple_parse/simple_parse.dmp rename to tests/memdumps/simple_parse/simple_parse.dmp diff --git a/test/memdumps/simple_parse/simple_parse_visited.txt b/tests/memdumps/simple_parse/simple_parse_visited.txt similarity index 100% rename from test/memdumps/simple_parse/simple_parse_visited.txt rename to tests/memdumps/simple_parse/simple_parse_visited.txt diff --git a/test/memdumps/win32_api_test/README.txt b/tests/memdumps/win32_api_test/README.txt similarity index 100% rename from test/memdumps/win32_api_test/README.txt rename to tests/memdumps/win32_api_test/README.txt diff --git a/test/memdumps/win32_api_test/api_names.txt b/tests/memdumps/win32_api_test/api_names.txt similarity index 100% rename from test/memdumps/win32_api_test/api_names.txt rename to tests/memdumps/win32_api_test/api_names.txt diff --git a/test/memdumps/win32_api_test/args.json b/tests/memdumps/win32_api_test/args.json similarity index 100% rename from test/memdumps/win32_api_test/args.json rename to tests/memdumps/win32_api_test/args.json diff --git a/test/memdumps/win32_api_test/win32_api_test.c b/tests/memdumps/win32_api_test/win32_api_test.c similarity index 100% rename from test/memdumps/win32_api_test/win32_api_test.c rename to tests/memdumps/win32_api_test/win32_api_test.c diff --git a/test/memdumps/win32_api_test/win32_api_test.dmp b/tests/memdumps/win32_api_test/win32_api_test.dmp similarity index 100% rename from test/memdumps/win32_api_test/win32_api_test.dmp rename to tests/memdumps/win32_api_test/win32_api_test.dmp diff --git a/test/memdumps/win32_api_test/win32_api_test_visited.txt b/tests/memdumps/win32_api_test/win32_api_test_visited.txt similarity index 100% rename from test/memdumps/win32_api_test/win32_api_test_visited.txt rename to tests/memdumps/win32_api_test/win32_api_test_visited.txt diff --git a/test/mockmem.py b/tests/mockmem.py similarity index 100% rename from test/mockmem.py rename to tests/mockmem.py diff --git a/test/test_allinsts.py b/tests/test_allinsts.py similarity index 100% rename from test/test_allinsts.py rename to tests/test_allinsts.py diff --git a/test/test_armv7_bitwise.py b/tests/test_armv7_bitwise.py similarity index 100% rename from test/test_armv7_bitwise.py rename to tests/test_armv7_bitwise.py diff --git a/test/test_armv7cpu.py b/tests/test_armv7cpu.py similarity index 100% rename from test/test_armv7cpu.py rename to tests/test_armv7cpu.py diff --git a/test/test_armv7rf.py b/tests/test_armv7rf.py similarity index 100% rename from test/test_armv7rf.py rename to tests/test_armv7rf.py diff --git a/test/test_binaries.py b/tests/test_binaries.py similarity index 100% rename from test/test_binaries.py rename to tests/test_binaries.py diff --git a/test/test_cpu_automatic.py b/tests/test_cpu_automatic.py similarity index 100% rename from test/test_cpu_automatic.py rename to tests/test_cpu_automatic.py diff --git a/test/test_cpu_manual.py b/tests/test_cpu_manual.py similarity index 100% rename from test/test_cpu_manual.py rename to tests/test_cpu_manual.py diff --git a/test/test_driver.py b/tests/test_driver.py similarity index 100% rename from test/test_driver.py rename to tests/test_driver.py diff --git a/test/test_linux.py b/tests/test_linux.py similarity index 100% rename from test/test_linux.py rename to tests/test_linux.py diff --git a/test/test_manticore.py b/tests/test_manticore.py similarity index 91% rename from test/test_manticore.py rename to tests/test_manticore.py index 8ad81fd..c81fe43 100644 --- a/test/test_manticore.py +++ b/tests/test_manticore.py @@ -4,7 +4,7 @@ from manticore import Manticore class ManticoreTest(unittest.TestCase): def setUp(self): - self.m = Manticore('test/binaries/arguments_linux_amd64') + self.m = Manticore('tests/binaries/arguments_linux_amd64') def test_add_hook(self): def tmp(state): @@ -29,7 +29,7 @@ class ManticoreTest(unittest.TestCase): @unittest.skip('TODO(mark): (#52) activating this test breaks something z3 related for following tests') def test_integration_basic_stdin(self): import os, struct - self.m = Manticore('test/binaries/basic_linux_amd64') + self.m = Manticore('tests/binaries/basic_linux_amd64') self.m.run() workspace = os.path.join(os.getcwd(), self.m.workspace) with open(os.path.join(workspace, 'test_00000001.stdin')) as f: diff --git a/test/test_memdumps.py b/tests/test_memdumps.py similarity index 100% rename from test/test_memdumps.py rename to tests/test_memdumps.py diff --git a/test/test_memory.py b/tests/test_memory.py similarity index 100% rename from test/test_memory.py rename to tests/test_memory.py diff --git a/test/test_register.py b/tests/test_register.py similarity index 100% rename from test/test_register.py rename to tests/test_register.py diff --git a/test/test_signal.py b/tests/test_signal.py similarity index 100% rename from test/test_signal.py rename to tests/test_signal.py diff --git a/test/test_smtlibv2.py b/tests/test_smtlibv2.py similarity index 100% rename from test/test_smtlibv2.py rename to tests/test_smtlibv2.py diff --git a/test/test_state.py b/tests/test_state.py similarity index 100% rename from test/test_state.py rename to tests/test_state.py