From de100b7d2823e0496a0cad055625063204d0d585 Mon Sep 17 00:00:00 2001
From: Janusz Jankowski <janusz.jankowski@linux.intel.com>
Date: Tue, 10 Jul 2018 15:25:33 +0200
Subject: [PATCH] test: fix CFLAGS and LDFLAGS warnings

Signed-off-by: Janusz Jankowski <janusz.jankowski@linux.intel.com>
---
 test/cmocka/Makefile.am          | 9 ++++-----
 test/cmocka/src/lib/alloc/mock.c | 3 +++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/test/cmocka/Makefile.am b/test/cmocka/Makefile.am
index 8aee8d115cda..7efabbc1796e 100644
--- a/test/cmocka/Makefile.am
+++ b/test/cmocka/Makefile.am
@@ -6,10 +6,12 @@ if BUILD_XTENSA
 LOG_COMPILER = xt-run
 endif
 
-AM_CFLAGS = \
+override AM_CFLAGS := \
+	$(filter-out -nostdlib,$(AM_CFLAGS)) \
 	$(SOF_INCDIR)
 
-AM_LDFLAGS =
+override AM_LDFLAGS := \
+	$(filter-out -nostdlib,$(AM_LDFLAGS))
 
 if HAVE_CMOCKA_PREFIX
 AM_CFLAGS += -I$(CMOCKA_PREFIX)/include
@@ -26,9 +28,6 @@ if BUILD_HOST
 AM_CFLAGS += -I../../src/arch/host/include
 endif
 
-CFLAGS := $(filter-out -nostdlib,$(CFLAGS))
-LDFLAGS := $(filter-out -nostdlib,$(LDFLAGS))
-
 LDADD = -lcmocka
 
 # memory allocator test
diff --git a/test/cmocka/src/lib/alloc/mock.c b/test/cmocka/src/lib/alloc/mock.c
index 37dee1caa4c5..1fd882b94ff1 100644
--- a/test/cmocka/src/lib/alloc/mock.c
+++ b/test/cmocka/src/lib/alloc/mock.c
@@ -26,6 +26,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * Author: Slawomir Blauciak <slawomir.blauciak@linux.intel.com>
+ *         Janusz Jankowski <janusz.jankowski@linux.intel.com>
  */
 
 #include <stdint.h>
@@ -38,11 +39,13 @@ struct dma_sg_config;
 int dma_copy_from_host(struct dma_copy *dc, struct dma_sg_config *host_sg,
 		       int32_t host_offset, void *local_ptr, int32_t size)
 {
+	return 0;
 }
 
 int dma_copy_to_host(struct dma_copy *dc, struct dma_sg_config *host_sg,
 		     int32_t host_offset, void *local_ptr, int32_t size)
 {
+	return 0;
 }
 
 void _trace_event_mbox_atomic(uint32_t e)