Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

i#2154 Android64: Get tests building #7201

Merged
merged 5 commits into from
Jan 22, 2025
Merged

i#2154 Android64: Get tests building #7201

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
778cefa
i#2154 Android64: Get tests building
jackgallagher-arm Jan 14, 2025
d0e2e31
Remove --export-dynamic for _USES_DR_VERSION_
jackgallagher-arm Jan 22, 2025
a715bb5
Build linux.infloop
jackgallagher-arm Jan 22, 2025
e2b8844
Copy run_in_bg tool to device
jackgallagher-arm Jan 22, 2025
0762ef4
Add TODO comments
jackgallagher-arm Jan 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions make/DynamoRIOConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1141,10 +1141,12 @@ function (configure_DynamoRIO_static target)

if (ANDROID)
# The Android linker is not exporting the weak symbol _USES_DR_VERSION_.
# We use --dynamic-list-data to do so.
# We use --dynamic-list to do so.
jackgallagher-arm marked this conversation as resolved.
Show resolved Hide resolved
file (WRITE ${CMAKE_CURRENT_BINARY_DIR}/dynamic_symbol_list "{ _USES_DR_VERSION_; };")
# Actually the Linux linker is exporting the entire DR API symbol set:
# should we pass -Wl,--export-dynamic here to match it?
_DR_append_property_string(TARGET ${target} LINK_FLAGS "-Wl,--dynamic-list-data")
_DR_append_property_string(TARGET ${target} LINK_FLAGS
"-Wl,--dynamic-list=${CMAKE_CURRENT_BINARY_DIR}/dynamic_symbol_list")
endif ()
# We need libc before the ntdll_imports pulled in for DR.
_DR_get_static_libc_list(static_libc)
Expand Down
10 changes: 6 additions & 4 deletions suite/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1420,7 +1420,9 @@ function(torun test key source native standalone_dr dr_ops exe_ops added_out pas
file(READ "${testpath}/${srcbase}.runall" runall)
if (UNIX)
# We always run infloop.
get_target_path_for_execution(app_path linux.infloop "${location_suffix}")
if (NOT ANDROID)
get_target_path_for_execution(app_path linux.infloop "${location_suffix}")
jackgallagher-arm marked this conversation as resolved.
Show resolved Hide resolved
endif()
if ("${runall}" MATCHES "<attach>")
# Add a starting message with -v, and avoid mprotect for now (i#38: mprotect
# is failing).
Expand Down Expand Up @@ -2129,7 +2131,7 @@ if (BUILD_CLIENTS)
endif ()
endif ()

if (AARCH64 AND UNIX AND ZLIB_FOUND)
if (AARCH64 AND UNIX AND ZLIB_FOUND AND NOT ANDROID)
jackgallagher-arm marked this conversation as resolved.
Show resolved Hide resolved
# Test TLB simulator with a virtual to physical v2p.textproto mapping.
set(srcdir
${PROJECT_SOURCE_DIR}/clients/drcachesim/tests/drmemtrace.threadsig.aarch64.raw)
Expand Down Expand Up @@ -5712,7 +5714,7 @@ if (UNIX)
# when running tests in parallel: have to generate pcaches first
set(linux.persist-use_FLAKY_depends linux.persist_FLAKY)

if (LINUX AND X64 AND HAVE_RSEQ AND NOT RISCV64)
if (LINUX AND X64 AND HAVE_RSEQ AND NOT RISCV64 AND NOT ANDROID)
jackgallagher-arm marked this conversation as resolved.
Show resolved Hide resolved
# The rseq kernel feature is Linux-only.
# TODO i#2350: Port the assembly in the test to 32-bit x86 and to ARM.
# TODO i#3544: Port tests to RISC-V 64
Expand Down Expand Up @@ -6426,7 +6428,7 @@ if (BUILD_CLIENTS AND NOT ANDROID)
code_api|tool.drcacheoff.simple
PROPERTIES LABELS UBUNTU_22)
endif ()
if (LINUX AND X64 AND HAVE_RSEQ AND NOT RISCV64) # TODO i#3544: Port tests to RISC-V 64
if (LINUX AND X64 AND HAVE_RSEQ AND NOT RISCV64 AND NOT ANDROID) # TODO i#3544: Port tests to RISC-V 64
jackgallagher-arm marked this conversation as resolved.
Show resolved Hide resolved
set_tests_properties(
code_api|api.rseq
code_api|linux.rseq_disable
Expand Down
Loading