rhempel · rhempel · Feb 1, 2025 · Mar 30, 2024 · Mar 31, 2024 · Apr 1, 2024
diff --git a/.github/workflows/verifier.yml b/.github/workflows/verifier.yml
@@ -1,16 +1,76 @@
-name: verifier
+name: verifyer
 on: [pull_request, workflow_dispatch]
 jobs:
   multi_test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: ruby/setup-ruby@v1
+      - uses: actions/checkout@main
+
+      - name: Install cpputest and lcov ...
+        run: |
+          sudo apt install --no-install-recommends -y cpputest lcov
+          sudo pip install junit2html
+
+      - name: Directory test
+        run: |
+          echo ${HOME}
+          echo ${PWD}
+          mkdir -p ${HOME}/work/umm_malloc/src
+          find ${HOME}/work/umm_malloc -type d
+
+      - name: Link umm_malloc to src
+        run: |
+          ln -s  ${HOME}/work/umm_malloc/umm_malloc ${HOME}/work/umm_malloc/src/umm_malloc         
+          ls -al ${HOME}/work/umm_malloc/src/umm_malloc
+
+      - name: Link unittest to src
+        run: |
+          ln -s  ${HOME}/work/umm_malloc/umm_malloc/unittest ${HOME}/work/umm_malloc/src/unittest
+          ls -al ${HOME}/work/umm_malloc/src/unittest
+
+      - name: Copy adaptabuild config files
+        run: |
+          cp ${HOME}/work/umm_malloc/umm_malloc/adaptabuild/* ${HOME}/work/umm_malloc
+          ls -al ${HOME}/work/umm_malloc
+
+      - name: Clone adaptabuild
+        run: |
+          git clone https://github.com/rhempel/adaptabuild.git ${HOME}/work/umm_malloc/adaptabuild
+          ls -al ${HOME}/work/umm_malloc
+
+      - name: Run the unit tests
+        run: |
+          make -f ${HOME}/work/umm_malloc/adaptabuild.mak MCU=host PRODUCT=unittest unittest
+          ls -al ${HOME}/work/umm_malloc/artifacts
+          find ${HOME}/work/umm_malloc/artifacts
+
+      - name: Archive test and coverage results
+        uses: actions/upload-artifact@main
         with:
-          ruby-version: 3.0.2
+          name: Test and Coverage Results
+          path: ~/work/umm_malloc/artifacts/unittest/host/umm_malloc
+
+
+#          ls -al unittest
+#          ls -al unittest/artifacts/unittest/host/umm_malloc/
+#          ls -al ~
+#          ls -al ${PWD}/unittest/artifacts/unittest/host/umm_malloc
+#          echo ${PWD}
+#          echo ${HOME}
+#          find ${HOME} -type d
+
+#      - name: Archive test and coverage results
+#        uses: actions/upload-artifact@main
+#        with:
+#          name: Test and Coverage Results
+#          path: ${HOME}/work/unittest/artifacts/unittest/host/umm_malloc
+
+#          cd unittest     && cp src/umm_malloc/adaptabuild/* .
+#          cd unittest     && make -f adaptabuild.mak MCU=host PRODUCT=unittest unittest
+#          ls -al unittest
 
-      - name: Install ceedling
-        run: gem install ceedling
+#      - name: Link unittest source up one level
+#        run: sudo apt install --no-install-recommends -y cpputest
 
-      - name: Run multi-configuration tests
-        run: ./multitest.sh
+#      - name: Run multi-configuration tests
+#        run: ./multitest.sh
diff --git a/adaptabuild.mak b/adaptabuild.mak
@@ -1,7 +1,5 @@
 # ----------------------------------------------------------------------------
-# umm_malloc makefile
-# (c)2006-2023 by Ralph Hempel, Owen Sound, Canada
-# rhempel@hempeldesigngroup.com
+# umm_malloc makefile for adaptabuild
 #
 # This is designed to be included as part of a make system designed
 # to be expandable and maintainable using techniques found in:
@@ -12,10 +10,10 @@
 MODULE := umm_malloc
 
 MODULE_PATH := $(call make_current_module_path)
-$(info MODULE_PATH is $(MODULE_PATH))
+$(call log_debug,MODULE_PATH is $(MODULE_PATH))
 
 $(MODULE)_PATH := $(MODULE_PATH)
-$(info $(MODULE)_PATH is $($(MODULE)_PATH))
+$(call log_debug,$(MODULE)_PATH is $($(MODULE)_PATH))
 
 # ----------------------------------------------------------------------------
 # Source file lists go here, C dependencies are automatically generated
@@ -36,42 +34,36 @@ 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 specifics for the source, include, and object paths
-
-$(MODULE)_SRCPATH :=
-$(MODULE)_SRCPATH += $(MODULE_PATH)/src
+# Set up the module level include path
 
 $(MODULE)_INCPATH :=
-$(MODULE)_INCPATH += $(umm_libc_PATH)/include
 
 ifeq (unittest,$(MAKECMDGOALS))
-  $(MODULE)_SRCPATH += $(MODULE_PATH)/unittest
-
   $(MODULE)_INCPATH += $(MODULE_PATH)/src
-  $(MODULE)_INCPATH += $(MODULE_PATH)/unittest
+  $(MODULE)_INCPATH += $(MODULE_PATH)/cpputest
 endif
 
 # ----------------------------------------------------------------------------
 # NOTE: The default config file must be created somehow - it is normally
 #       up to the developer to specify which defines are needed and how they
 #       are to be configured.
 #
-# By convention we place config files in product/$(PRODUCT)/config/$(MCU) because
+# By convention we place config files in $(PRODUCT)/config/$(MCU) because
 # that's an easy pace to leave things like HAL config, linker scripts etc
 
-$(MODULE)_INCPATH += product/$(PRODUCT)/config/$(MCU)
+$(MODULE)_INCPATH += $(PRODUCT)/config/$(MCU)
 
 # ----------------------------------------------------------------------------
 # Set any module level compile time defaults here
@@ -80,7 +72,7 @@ $(MODULE)_CDEFS :=
 $(MODULE)_CDEFS +=
 
 $(MODULE)_CFLAGS :=
-$(MODULE)_CFLAGS += -Wno-builtin-declaration-mismatch
+$(MODULE)_CFLAGS +=
 
 ifeq (unittest,$(MAKECMDGOALS))
   $(MODULE)_CDEFS +=
@@ -93,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)
-  $(MODULE)_test_main = $(MODULE)/unittest/main.o
+  TESTABLE_MODULES += $(MODULE)_UNITTEST
+  $(MODULE)_test_main := cpputest/main.o
   include $(ADAPTABUILD_PATH)/make/test/cpputest.mak
 endif
 

diff --git a/adaptabuild/adaptabuild.mak b/adaptabuild/adaptabuild.mak
@@ -0,0 +1,24 @@
+# ----------------------------------------------------------------------------
+# Do NOT move these functions - they must live in the top level makefile
+#
+ABS_PATH := $(patsubst %/,%,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))
+$(call log_info,ABS_PATH is $(ABS_PATH))
+
+ROOT_PATH := $(patsubst %/,%,$(dir $(firstword $(MAKEFILE_LIST))))
+$(call log_info,ROOT_PATH is $(ROOT_PATH))
+
+# The adaptabuild path MUST be at the root level
+#
+ADAPTABUILD_PATH := $(ROOT_PATH)/adaptabuild
+
+LOG_ERROR ?=
+LOG_WARNING ?=
+LOG_NOTICE ?= x
+LOG_INFO ?=
+LOG_DEBUG ?= x
+
+# Add any top level definitions for adaptabuild here:
+#
+GCC_VERSION := 10.3.1
+
+include $(ADAPTABUILD_PATH)/make/adaptabuild.mak
diff --git a/adaptabuild/adaptabuild_artifacts.mak b/adaptabuild/adaptabuild_artifacts.mak
@@ -0,0 +1,14 @@
+# ----------------------------------------------------------------------------
+# adaptabuild_artifacts.mak - product specific libraries file
+#
+# Here is where you specify the libraries or other artifacts your product
+# needs to have built.
+# ----------------------------------------------------------------------------
+
+ifeq (host,$(MCU))
+    # Do nothing - we want the standard library for host builds
+else
+    # Do nothing
+endif
+
+include $(SRC_PATH)/umm_malloc/adaptabuild.mak
diff --git a/adaptabuild/adaptabuild_product.mak b/adaptabuild/adaptabuild_product.mak
@@ -0,0 +1,16 @@
+# ----------------------------------------------------------------------------
+# adaptabuild_product.mak - product specific include file
+#
+# Here is where you specify your product options
+# ----------------------------------------------------------------------------
+
+PRODUCT_LIST := unittest  
+
+ifneq ($(filter $(PRODUCT),$(PRODUCT_LIST)),)
+  # Set PRODUCT_MAIN here based on $(PRODUCT)
+  # The unittest product typically does not need PRODUCT_MAIN
+else
+  $(error PRODUCT must be one of $(PRODUCT_LIST))
+endif
+
+
diff --git a/ceedling.cmd b/ceedling.cmd
diff --git a/unittest/main.cpp → cpputest/main.cpp b/unittest/main.cpp → cpputest/main.cpp
diff --git a/unittest/support_umm_malloc.cpp → cpputest/support_umm_malloc.cpp b/unittest/support_umm_malloc.cpp → cpputest/support_umm_malloc.cpp
diff --git a/test/support/support_umm_malloc.h → cpputest/support_umm_malloc.h b/test/support/support_umm_malloc.h → cpputest/support_umm_malloc.h
diff --git a/unittest/test_FirstMalloc.cpp → cpputest/test_FirstMalloc.cpp b/unittest/test_FirstMalloc.cpp → cpputest/test_FirstMalloc.cpp
diff --git a/unittest/test_Free.cpp → cpputest/test_Free.cpp b/unittest/test_Free.cpp → cpputest/test_Free.cpp
diff --git a/unittest/test_Metrics.cpp → cpputest/test_Metrics.cpp b/unittest/test_Metrics.cpp → cpputest/test_Metrics.cpp
diff --git a/unittest/test_MultiMalloc.cpp → cpputest/test_MultiMalloc.cpp b/unittest/test_MultiMalloc.cpp → cpputest/test_MultiMalloc.cpp
diff --git a/unittest/test_Poison.cpp → cpputest/test_Poison.cpp b/unittest/test_Poison.cpp → cpputest/test_Poison.cpp
diff --git a/unittest/test_Realloc.cpp → cpputest/test_Realloc.cpp b/unittest/test_Realloc.cpp → cpputest/test_Realloc.cpp
diff --git a/unittest/test_Stress.cpp → cpputest/test_Stress.cpp b/unittest/test_Stress.cpp → cpputest/test_Stress.cpp
diff --git a/unittest/test_TooBigMalloc.cpp → cpputest/test_TooBigMalloc.cpp b/unittest/test_TooBigMalloc.cpp → cpputest/test_TooBigMalloc.cpp
diff --git a/project.yml b/project.yml
diff --git a/test/options/default.yml b/test/options/default.yml
diff --git a/test/options/enable_critical_depth_check.yml b/test/options/enable_critical_depth_check.yml
diff --git a/test/options/enable_info.yml b/test/options/enable_info.yml
diff --git a/test/options/enable_inline_metrics.yml b/test/options/enable_inline_metrics.yml