From 2871f5070f95de8cabd29ccabf18908c82dd1c92 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sun, 7 Jan 2024 21:38:49 +0100
Subject: [PATCH] CMake: re-enable cargo-test under ASAN

With autocxx/cxx gone, this seems to work fine now.
---
 cmake/Tests.cmake | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/cmake/Tests.cmake b/cmake/Tests.cmake
index 3c0b63058..19486e4ee 100644
--- a/cmake/Tests.cmake
+++ b/cmake/Tests.cmake
@@ -157,18 +157,13 @@ if(DEFINED ASAN)
     set(cargo_target_opt "--target" ${Rust_CARGO_TARGET})
 endif()
 
-# cargo-test is failing to link w/ ASAN enabled. For some reason it is picking up autocxx ffi
-# 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"
-        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}"
-    )
-    set_tests_properties("cargo-test" PROPERTIES SKIP_RETURN_CODE ${SKIP_RETURN_CODE})
-    add_test_target("cargo-test")
-endif()
+add_test(
+    NAME "cargo-test"
+    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}"
+)
+set_tests_properties("cargo-test" PROPERTIES SKIP_RETURN_CODE ${SKIP_RETURN_CODE})
+add_test_target("cargo-test")
 
 add_test(
     NAME "cargo-test-widestring"