Skip to content

Commit 0e92db3

Browse files
committed
ut: fix tests on xtensa-smp
Fixes UT on xtensa-smp architecture. Signed-off-by: Tomasz Lauda <tomasz.lauda@linux.intel.com>
1 parent 3ae5e63 commit 0e92db3

3 files changed

Lines changed: 27 additions & 10 deletions

File tree

test/cmocka/Makefile.am

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -70,23 +70,17 @@ mixer_LDADD = -lm $(LDADD)
7070

7171
if BUILD_XTENSA
7272

73-
if BUILD_XTENSA_SMP
74-
pipeline_cpu_c = ../../src/arch/xtensa/smp/cpu.c
75-
else
76-
pipeline_cpu_c = ../../src/arch/xtensa/up/cpu.c
77-
endif
78-
7973
check_PROGRAMS += pipeline_new
80-
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
74+
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
8175

8276
check_PROGRAMS += pipeline_new_allocation
83-
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
77+
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
8478

8579
check_PROGRAMS += pipeline_connect_upstream
86-
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 src/audio/pipeline/pipeline_connection_mocks.c
80+
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 src/audio/pipeline/pipeline_connection_mocks.c
8781

8882
check_PROGRAMS += pipeline_free
89-
pipeline_free_SOURCES = $(pipeline_cpu_c) ../../src/audio/pipeline.c src/audio/pipeline/pipeline_mocks.c src/audio/pipeline/pipeline_free.c src/audio/pipeline/pipeline_mocks_rzalloc.c src/audio/pipeline/pipeline_connection_mocks.c
83+
pipeline_free_SOURCES = ../../src/audio/pipeline.c src/audio/pipeline/pipeline_mocks.c src/audio/pipeline/pipeline_free.c src/audio/pipeline/pipeline_mocks_rzalloc.c src/audio/pipeline/pipeline_connection_mocks.c
9084

9185
endif
9286

test/cmocka/src/audio/pipeline/pipeline_mocks.c

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030

3131
#include "pipeline_mocks.h"
3232

33+
struct ipc *_ipc;
34+
3335
void platform_dai_timestamp(struct comp_dev *dai,
3436
struct sof_ipc_stream_posn *posn)
3537
{
@@ -89,3 +91,18 @@ void _trace_event1(uint32_t log_entry, uint32_t param)
8991
(void)log_entry;
9092
(void)param;
9193
}
94+
95+
int arch_cpu_is_core_enabled(int id)
96+
{
97+
return 1;
98+
}
99+
100+
void cpu_power_down_core(void) { }
101+
102+
struct ipc_comp_dev *ipc_get_comp(struct ipc *ipc, uint32_t id)
103+
{
104+
(void)ipc;
105+
(void)id;
106+
107+
return NULL;
108+
}

test/cmocka/src/audio/pipeline/pipeline_mocks.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,12 @@
4040
int ipc_stream_send_xrun(struct comp_dev *cdev,
4141
struct sof_ipc_stream_posn *posn);
4242

43+
int arch_cpu_is_core_enabled(int id);
44+
45+
void cpu_power_down_core(void);
46+
47+
struct ipc_comp_dev *ipc_get_comp(struct ipc *ipc, uint32_t id);
48+
4349
struct pipeline_new_setup_data {
4450
struct sof_ipc_pipe_new ipc_data;
4551
struct comp_dev *comp_data;

0 commit comments

Comments
 (0)