Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-28 05:43:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

CMake: re-enable cargo-test under ASAN

Browse source 
With autocxx/cxx gone, this seems to work fine now.
This commit is contained in:
Johannes Altmanninger 2024-01-07 21:38:49 +01:00
parent e98a794d1c
commit 2871f5070f
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
cmake/Tests.cmake
View file

@ -157,18 +157,13 @@ if(DEFINED ASAN)
set(cargo_target_opt "--target" ${Rust_CARGO_TARGET}) set(cargo_target_opt "--target" ${Rust_CARGO_TARGET})
endif() endif()
# cargo-test is failing to link w/ ASAN enabled. For some reason it is picking up autocxx ffi add_test(
# dependencies, even though `carg test` is supposed to be for rust-only code w/ no ffi dependencies.
# TODO: Figure this out and fix it.
if(NOT DEFINED ASAN)
add_test(
NAME "cargo-test" NAME "cargo-test"
COMMAND env ${VARS_FOR_CARGO} cargo test ${CARGO_FLAGS} --package fish-rust --target-dir ${rust_target_dir} ${cargo_target_opt} COMMAND env ${VARS_FOR_CARGO} cargo test ${CARGO_FLAGS} --package fish-rust --target-dir ${rust_target_dir} ${cargo_target_opt}
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
) )
set_tests_properties("cargo-test" PROPERTIES SKIP_RETURN_CODE ${SKIP_RETURN_CODE}) set_tests_properties("cargo-test" PROPERTIES SKIP_RETURN_CODE ${SKIP_RETURN_CODE})
add_test_target("cargo-test") add_test_target("cargo-test")
endif()
add_test( add_test(
NAME "cargo-test-widestring" NAME "cargo-test-widestring"