From 7536414bfab9ee81462b4730d3845eea935dbdea Mon Sep 17 00:00:00 2001 From: rusefillc Date: Fri, 22 Jul 2022 08:15:15 -0400 Subject: [PATCH] Revert "Reenable sanitize (#4365)" This reverts commit da6bf0a7759723a87cb5f9529da8e552f703015b. --- .github/workflows/build-rusEFI-console.yaml | 4 ++-- unit_tests/rules.mk | 2 +- unit_tests/unit_test_rules.mk | 12 +++++------- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-rusEFI-console.yaml b/.github/workflows/build-rusEFI-console.yaml index 8f57f873c0..8fad26c64f 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 SANITIZE=no build/lib_rusefi_test +# we have a unit test of JNI thus we need to build shared library + run: make -j4 - 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 30a967943a..398980c83b 100644 --- a/unit_tests/rules.mk +++ b/unit_tests/rules.mk @@ -89,7 +89,7 @@ VPATH = $(SRCPATHS) # Makefile rules # -all: $(OBJS) $(BINARY_OUTPUT) MAKE_ALL_RULE_HOOK +all: $(OBJS) $(BINARY_OUTPUT) $(SHARED_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 1888acae53..8cc941d35b 100644 --- a/unit_tests/unit_test_rules.mk +++ b/unit_tests/unit_test_rules.mk @@ -14,13 +14,11 @@ PCHSUB = unit_tests include $(PROJECT_DIR)/rusefi_rules.mk -# User may want to pass in a forced value for SANITIZE -ifeq ($(SANITIZE),) - ifneq ($(OS),Windows_NT) - SANITIZE = yes - else - SANITIZE = no - endif +ifneq ($(OS),Windows_NT) +# at the moment lib asan breaks JNI library + SANITIZE = no +else + SANITIZE = no endif IS_MAC = no