From bb164a60e68613b436f2a43a8d30134e9a7db8ca Mon Sep 17 00:00:00 2001 From: Ralph Hempel Date: Sun, 26 Jan 2025 21:10:34 +0000 Subject: [PATCH] Move to cpputest fr unit testing --- adaptabuild.mak | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/adaptabuild.mak b/adaptabuild.mak index 3358654..e062a0d 100755 --- a/adaptabuild.mak +++ b/adaptabuild.mak @@ -34,16 +34,16 @@ SRC_TEST := SRC_C += src/umm_malloc.c -SRC_TEST += unittest/test_FirstMalloc.c -SRC_TEST += unittest/test_TooBigMalloc.c -SRC_TEST += unittest/test_Free.c -SRC_TEST += unittest/test_Realloc.c -SRC_TEST += unittest/test_MultiMalloc.c -SRC_TEST += unittest/test_Metrics.c -SRC_TEST += unittest/test_Poison.c -SRC_TEST += unittest/test_Stress.c -SRC_TEST += unittest/support_umm_malloc.c -SRC_TEST += unittest/main.c +SRC_TEST += cpputest/test_FirstMalloc.c +SRC_TEST += cpputest/test_TooBigMalloc.c +SRC_TEST += cpputest/test_Free.c +SRC_TEST += cpputest/test_Realloc.c +SRC_TEST += cpputest/test_MultiMalloc.c +SRC_TEST += cpputest/test_Metrics.c +SRC_TEST += cpputest/test_Poison.c +SRC_TEST += cpputest/test_Stress.c +SRC_TEST += cpputest/support_umm_malloc.c +SRC_TEST += cpputest/main.c # ---------------------------------------------------------------------------- # Set up the module level include path @@ -52,7 +52,7 @@ $(MODULE)_INCPATH := ifeq (unittest,$(MAKECMDGOALS)) $(MODULE)_INCPATH += $(MODULE_PATH)/src - $(MODULE)_INCPATH += $(MODULE_PATH)/unittest + $(MODULE)_INCPATH += $(MODULE_PATH)/cpputest endif # ---------------------------------------------------------------------------- @@ -85,11 +85,11 @@ include $(ADAPTABUILD_PATH)/make/library.mak # ---------------------------------------------------------------------------- # Include the unit test framework makefile that works for this module -# if the target is unittest +# if the target is cpputest ifeq (unittest,$(MAKECMDGOALS)) TESTABLE_MODULES += $(MODULE)_UNITTEST - $(MODULE)_test_main := unittest/main.o + $(MODULE)_test_main := cpputest/main.o include $(ADAPTABUILD_PATH)/make/test/cpputest.mak endif