From 6072e455f36c49331beabfec84ccae1b5270437f Mon Sep 17 00:00:00 2001 From: Dmitriy Korovkin Date: Tue, 25 Oct 2016 13:19:26 -0400 Subject: [PATCH] unified/tests: Adapt test_aes for unified kernel Unified kernel invokes main() function in the init thread. This eliminates the need for a separate thread for the test. Change-Id: I4ff2e160213d152ca7c5d8422162f3464d935119 Signed-off-by: Dmitriy Korovkin --- tests/crypto/test_aes/Makefile | 3 +-- tests/crypto/test_aes/prj.conf | 1 + tests/crypto/test_aes/prj.mdef | 5 ----- tests/crypto/test_aes/testcase.ini | 4 ++-- 4 files changed, 4 insertions(+), 9 deletions(-) delete mode 100644 tests/crypto/test_aes/prj.mdef diff --git a/tests/crypto/test_aes/Makefile b/tests/crypto/test_aes/Makefile index 44eeaa6d573..4381308c5ad 100644 --- a/tests/crypto/test_aes/Makefile +++ b/tests/crypto/test_aes/Makefile @@ -1,6 +1,5 @@ BOARD ?= qemu_x86 -MDEF_FILE = prj.mdef -KERNEL_TYPE = micro +KERNEL_TYPE = unified CONF_FILE = prj.conf include $(ZEPHYR_BASE)/Makefile.inc diff --git a/tests/crypto/test_aes/prj.conf b/tests/crypto/test_aes/prj.conf index cd711875ce7..72b962c920f 100644 --- a/tests/crypto/test_aes/prj.conf +++ b/tests/crypto/test_aes/prj.conf @@ -1,3 +1,4 @@ CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_TINYCRYPT=y CONFIG_TINYCRYPT_AES=y +CONFIG_MAIN_STACK_SIZE=5120 diff --git a/tests/crypto/test_aes/prj.mdef b/tests/crypto/test_aes/prj.mdef deleted file mode 100644 index 8cfab864c8b..00000000000 --- a/tests/crypto/test_aes/prj.mdef +++ /dev/null @@ -1,5 +0,0 @@ -% Application : test AES128 TinyCrypt APIs - -% TASK NAME PRIO ENTRY STACK GROUPS -% ==================================================== - TASK tStartTask 7 main 5120 [EXE] diff --git a/tests/crypto/test_aes/testcase.ini b/tests/crypto/test_aes/testcase.ini index bc515efdfa3..ba6747f17f6 100644 --- a/tests/crypto/test_aes/testcase.ini +++ b/tests/crypto/test_aes/testcase.ini @@ -1,4 +1,4 @@ [test] -tags = crypto aes +tags = crypto aes unified_capable build_only = false -kernel = micro +kernel = unified