From a131c2c5599e57cc86634fe6c392222d50c87902 Mon Sep 17 00:00:00 2001
From: Matthew Kennedy <matthewkennedy@outlook.com>
Date: Tue, 26 Jul 2022 23:22:22 -0700
Subject: [PATCH] Reenable sanitize (#4384)

* turn on sanitize, fix overrun

* allow sanitize override, disable it for shared lib

* probably fix android build
---
 .github/workflows/build-android.yaml        |  2 +-
 .github/workflows/build-rusEFI-console.yaml |  4 ++--
 unit_tests/rules.mk                         |  2 +-
 unit_tests/unit_test_rules.mk               | 12 +++++++-----
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build-android.yaml b/.github/workflows/build-android.yaml
index ca20bd863d..1ff51818e1 100644
--- a/.github/workflows/build-android.yaml
+++ b/.github/workflows/build-android.yaml
@@ -24,7 +24,7 @@ jobs:
       - name: Build Native Unit Tests as shared library
         working-directory: ./unit_tests/
         # we have a unit test of JNI thus we need to build shared library
-        run: make -j4
+        run: make -j4 SANITIZE=no build/lib_rusefi_test
 
       - name: Build Android
         env:
diff --git a/.github/workflows/build-rusEFI-console.yaml b/.github/workflows/build-rusEFI-console.yaml
index 8fad26c64f..ad529a096b 100644
--- a/.github/workflows/build-rusEFI-console.yaml
+++ b/.github/workflows/build-rusEFI-console.yaml
@@ -31,8 +31,8 @@ jobs:
 
       - name: Build Native Unit Tests as shared library
         working-directory: ./unit_tests/
-# we have a unit test of JNI thus we need to build shared library
-        run: make -j4
+        # we have a unit test of JNI thus we need to build shared library
+        run: make -j4 SANITIZE=no build/lib_rusefi_test
 
       - name: Test console
         # at the moment 'jar' task does not depend on tests?! maybe because tests take some time?
diff --git a/unit_tests/rules.mk b/unit_tests/rules.mk
index 398980c83b..30a967943a 100644
--- a/unit_tests/rules.mk
+++ b/unit_tests/rules.mk
@@ -89,7 +89,7 @@ VPATH     = $(SRCPATHS)
 # Makefile rules
 #
 
-all: $(OBJS) $(BINARY_OUTPUT) $(SHARED_OUTPUT) MAKE_ALL_RULE_HOOK
+all: $(OBJS) $(BINARY_OUTPUT) MAKE_ALL_RULE_HOOK
 
 MAKE_ALL_RULE_HOOK:
 
diff --git a/unit_tests/unit_test_rules.mk b/unit_tests/unit_test_rules.mk
index 8cc941d35b..1888acae53 100644
--- a/unit_tests/unit_test_rules.mk
+++ b/unit_tests/unit_test_rules.mk
@@ -14,11 +14,13 @@ PCHSUB = unit_tests
 
 include $(PROJECT_DIR)/rusefi_rules.mk
 
-ifneq ($(OS),Windows_NT)
-# at the moment lib asan breaks JNI library
-	SANITIZE = no
-else
-	SANITIZE = no
+# User may want to pass in a forced value for SANITIZE
+ifeq ($(SANITIZE),)
+	ifneq ($(OS),Windows_NT)
+		SANITIZE = yes
+	else
+		SANITIZE = no
+	endif
 endif
 
 IS_MAC = no