Merge pull request #281 from jajanusz/fix-ut

test: cmocka: fix pipeline tests, disable alloc tests

Author: lgirdwood

test/cmocka/Makefile.am

@@ -26,7 +26,8 @@ endif
 
 if BUILD_XTENSA
 AM_CFLAGS += -I../../src/arch/xtensa/include
-AM_CFLAGS += -I../../src/platform/$(PLATFORM)/include
+AM_CFLAGS += $(ARCH_INCDIR)
+AM_CFLAGS += $(PLATFORM_INCDIR)
 AM_CFLAGS += -I../../src/audio
 endif
 
@@ -47,9 +48,31 @@ mixer_LDADD = -lm $(LDADD)
 
 # memory allocator test
 
+# TODO: fix
+#if BUILD_XTENSA
+#check_PROGRAMS += alloc
+#alloc_SOURCES = src/lib/alloc/alloc.c src/lib/alloc/mock.c ../../src/lib/alloc.c ../../src/platform/intel/cavs/memory.c
+#endif
+
+# pipeline tests
+
 if BUILD_XTENSA
-check_PROGRAMS += alloc
-alloc_SOURCES = src/lib/alloc/alloc.c src/lib/alloc/mock.c ../../src/lib/alloc.c ../../src/platform/apollolake/memory.c
+
+if BUILD_XTENSA_SMP
+pipeline_cpu_c = ../../src/arch/xtensa/smp/cpu.c
+else
+pipeline_cpu_c = ../../src/arch/xtensa/up/cpu.c
+endif
+
+check_PROGRAMS += pipeline_new
+pipeline_new_SOURCES = $(pipeline_cpu_c) ../../src/audio/pipeline.c  src/audio/pipeline/pipeline_new.c src/audio/pipeline/pipeline_mocks.c src/audio/pipeline/pipeline_mocks_rzalloc.c
+
+check_PROGRAMS += pipeline_new_allocation
+pipeline_new_allocation_SOURCES = $(pipeline_cpu_c) ../../src/audio/pipeline.c  src/audio/pipeline/pipeline_new_allocation.c src/audio/pipeline/pipeline_mocks.c src/audio/pipeline/pipeline_new_allocation_mocks.c
+
+check_PROGRAMS += pipeline_connect_upstream
+pipeline_connect_upstream_SOURCES = $(pipeline_cpu_c) ../../src/audio/pipeline.c src/audio/pipeline/pipeline_mocks.c src/audio/pipeline/pipeline_connect_upstream.c src/audio/pipeline/pipeline_mocks_rzalloc.c
+
 endif
 
 # lib/lib tests
@@ -62,17 +85,6 @@ check_PROGRAMS += bzero
 bzero_SOURCES = src/lib/lib/bzero.c
 bzero_LDADD = ../../src/lib/libcore.a $(LDADD)
 
-# pipeline tests
-
-check_PROGRAMS += pipeline_new
-pipeline_new_SOURCES = ../../src/audio/pipeline.c  src/audio/pipeline/pipeline_new.c src/audio/pipeline/pipeline_mocks.c src/audio/pipeline/pipeline_mocks_rzalloc.c
-
-check_PROGRAMS += pipeline_new_allocation
-pipeline_new_allocation_SOURCES = ../../src/audio/pipeline.c  src/audio/pipeline/pipeline_new_allocation.c src/audio/pipeline/pipeline_mocks.c src/audio/pipeline/pipeline_new_allocation_mocks.c
-
-check_PROGRAMS += pipeline_connect_upstream
-pipeline_connect_upstream_SOURCES = ../../src/audio/pipeline.c src/audio/pipeline/pipeline_mocks.c src/audio/pipeline/pipeline_connect_upstream.c src/audio/pipeline/pipeline_mocks_rzalloc.c
-
 # volume tests
 
 check_PROGRAMS += volume_process