From 389dc9f96e67d87d17dbc61196116a91a2642dd1 Mon Sep 17 00:00:00 2001 From: Andrew Boie Date: Tue, 1 Nov 2016 10:41:17 -0700 Subject: [PATCH] tests: app_kernel: exclude call_test() on unified The unified kernel doesn't use the KERNEL_ENTRY() mechanism, it doesn't do kernel calls in a special context. So there's no reason to test this on the unified kernel and we can omit it. Change-Id: I2b8aa2495385a39130e9b87c0d0324f2f205a2c8 Signed-off-by: Andrew Boie --- tests/legacy/benchmark/app_kernel/src/Makefile | 8 +++++++- tests/legacy/benchmark/app_kernel/src/master.c | 2 ++ tests/legacy/benchmark/app_kernel/testcase.ini | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/tests/legacy/benchmark/app_kernel/src/Makefile b/tests/legacy/benchmark/app_kernel/src/Makefile index 7cf811551f0..c2f59e6f69b 100644 --- a/tests/legacy/benchmark/app_kernel/src/Makefile +++ b/tests/legacy/benchmark/app_kernel/src/Makefile @@ -3,6 +3,12 @@ ccflags-y += -I$(ZEPHYR_BASE)/tests/legacy/benchmark/latency_measure/microkernel -I${ZEPHYR_BASE}/tests/include obj-y := fifo_b.o mailbox_b.o master.o mempool_b.o \ - nop_b.o pipe_r.o sema_r.o event_b.o \ + pipe_r.o sema_r.o event_b.o \ fifo_r.o mailbox_r.o memmap_b.o mutex_b.o \ pipe_b.o receiver.o sema_b.o + +# TODO once we drop legacy support, remove completely +ifeq ($(CONFIG_KERNEL_V2),) +obj-y += nop_b.o +endif + diff --git a/tests/legacy/benchmark/app_kernel/src/master.c b/tests/legacy/benchmark/app_kernel/src/master.c index 816d6594291..6edd3b2655c 100644 --- a/tests/legacy/benchmark/app_kernel/src/master.c +++ b/tests/legacy/benchmark/app_kernel/src/master.c @@ -115,7 +115,9 @@ void BenchTask(void) output_file); PRINT_STRING(dashline, output_file); task_start(RECVTASK); +#ifndef CONFIG_KERNEL_V2 call_test(); +#endif queue_test(); sema_test(); mutex_test(); diff --git a/tests/legacy/benchmark/app_kernel/testcase.ini b/tests/legacy/benchmark/app_kernel/testcase.ini index 5b4ff149b01..be7ca40e74e 100644 --- a/tests/legacy/benchmark/app_kernel/testcase.ini +++ b/tests/legacy/benchmark/app_kernel/testcase.ini @@ -1,5 +1,5 @@ [test] -tags = benchmark +tags = benchmark unified_capable arch_whitelist = x86 # On my machine, takes about 110 to run, 180 to be safe timeout = 180