OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #448 from tlauda/topic/smp-fix-ut 

ut: fix tests on xtensa-smp
This commit is contained in:
Liam Girdwood 2018-10-01 20:39:02 +01:00 committed by GitHub
parent c4adc8700f 0e92db32c1
commit f574b71f55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/cmocka/Makefile.am
View File

@ -70,23 +70,17 @@ mixer_LDADD = -lm $(LDADD)
if BUILD_XTENSA if BUILD_XTENSA
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 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 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 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 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 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 src/audio/pipeline/pipeline_connection_mocks.c 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
check_PROGRAMS += pipeline_free check_PROGRAMS += pipeline_free
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 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
endif endif

17
test/cmocka/src/audio/pipeline/pipeline_mocks.c
View File

@ -30,6 +30,8 @@
#include "pipeline_mocks.h" #include "pipeline_mocks.h"
struct ipc *_ipc;
void platform_dai_timestamp(struct comp_dev *dai, void platform_dai_timestamp(struct comp_dev *dai,
struct sof_ipc_stream_posn *posn) struct sof_ipc_stream_posn *posn)
{ {
@ -89,3 +91,18 @@ void _trace_event1(uint32_t log_entry, uint32_t param)
(void)log_entry; (void)log_entry;
(void)param; (void)param;
} }
int arch_cpu_is_core_enabled(int id)
{
return 1;
}
void cpu_power_down_core(void) { }
struct ipc_comp_dev *ipc_get_comp(struct ipc *ipc, uint32_t id)
{
(void)ipc;
(void)id;
return NULL;
}

6
test/cmocka/src/audio/pipeline/pipeline_mocks.h
View File

@ -40,6 +40,12 @@
int ipc_stream_send_xrun(struct comp_dev *cdev, int ipc_stream_send_xrun(struct comp_dev *cdev,
struct sof_ipc_stream_posn *posn); struct sof_ipc_stream_posn *posn);
int arch_cpu_is_core_enabled(int id);
void cpu_power_down_core(void);
struct ipc_comp_dev *ipc_get_comp(struct ipc *ipc, uint32_t id);
struct pipeline_new_setup_data { struct pipeline_new_setup_data {
struct sof_ipc_pipe_new ipc_data; struct sof_ipc_pipe_new ipc_data;
struct comp_dev *comp_data; struct comp_dev *comp_data;