mirrors/unicorn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1691 from relapids/arm_specific_tests

Browse Source 
Disable ARM-specific tests when ARM is unavailable. (#1689)
This commit is contained in:
lazymio 2022-08-31 22:08:12 +08:00 committed by GitHub
commit a2f9630236
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -1412,6 +1412,9 @@ if(UNICORN_BUILD_TESTS)
add_executable(${TEST_FILE} add_executable(${TEST_FILE}
${CMAKE_CURRENT_SOURCE_DIR}/tests/unit/${TEST_FILE}.c ${CMAKE_CURRENT_SOURCE_DIR}/tests/unit/${TEST_FILE}.c
) )
target_compile_options(${TEST_FILE} PRIVATE
${UNICORN_COMPILE_OPTIONS}
)
target_link_libraries(${TEST_FILE} PRIVATE target_link_libraries(${TEST_FILE} PRIVATE
${SAMPLES_LIB} ${SAMPLES_LIB}
) )

10
tests/unit/test_ctl.c
View File

@ -175,6 +175,8 @@ static void test_uc_ctl_tb_cache(void)
OK(uc_close(uc)); OK(uc_close(uc));
} }
// Test requires UC_ARCH_ARM.
#ifdef UNICORN_HAS_ARM
static void test_uc_ctl_change_page_size(void) static void test_uc_ctl_change_page_size(void)
{ {
uc_engine *uc; uc_engine *uc;
@ -191,7 +193,10 @@ static void test_uc_ctl_change_page_size(void)
OK(uc_close(uc)); OK(uc_close(uc));
OK(uc_close(uc2)); OK(uc_close(uc2));
} }
#endif
// Test requires UC_ARCH_ARM.
#ifdef UNICORN_HAS_ARM
// Copy from test_arm.c but with new API. // Copy from test_arm.c but with new API.
static void test_uc_ctl_arm_cpu(void) static void test_uc_ctl_arm_cpu(void)
{ {
@ -226,6 +231,7 @@ static void test_uc_ctl_arm_cpu(void)
OK(uc_close(uc)); OK(uc_close(uc));
} }
#endif
static void test_uc_hook_cached_cb(uc_engine *uc, uint64_t addr, size_t size, static void test_uc_hook_cached_cb(uc_engine *uc, uint64_t addr, size_t size,
void *user_data) void *user_data)
@ -289,7 +295,9 @@ TEST_LIST = {{"test_uc_ctl_mode", test_uc_ctl_mode},
{"test_uc_ctl_time_out", test_uc_ctl_time_out}, {"test_uc_ctl_time_out", test_uc_ctl_time_out},
{"test_uc_ctl_exits", test_uc_ctl_exits}, {"test_uc_ctl_exits", test_uc_ctl_exits},
{"test_uc_ctl_tb_cache", test_uc_ctl_tb_cache}, {"test_uc_ctl_tb_cache", test_uc_ctl_tb_cache},
#ifdef UNICORN_HAS_ARM
{"test_uc_ctl_change_page_size", test_uc_ctl_change_page_size}, {"test_uc_ctl_change_page_size", test_uc_ctl_change_page_size},
{"test_uc_ctl_arm_cpu", test_uc_ctl_arm_cpu}, {"test_uc_ctl_arm_cpu", test_uc_ctl_arm_cpu},
#endif
{"test_uc_hook_cached_uaf", test_uc_hook_cached_uaf}, {"test_uc_hook_cached_uaf", test_uc_hook_cached_uaf},
{NULL, NULL}}; {NULL, NULL}};