From 81c94161f51b3885ba99bc9ecc5c924405655ab3 Mon Sep 17 00:00:00 2001 From: Dmitriy Korovkin Date: Thu, 27 Oct 2016 15:28:38 -0400 Subject: [PATCH] unified/tests: Adapt test_sha256 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: I4e6c4f212615d2135adf7971df32db1ad392c0e2 Signed-off-by: Dmitriy Korovkin --- tests/crypto/test_sha256/Makefile | 3 +-- tests/crypto/test_sha256/prj.conf | 1 + tests/crypto/test_sha256/prj.mdef | 5 ----- tests/crypto/test_sha256/testcase.ini | 8 ++++---- 4 files changed, 6 insertions(+), 11 deletions(-) delete mode 100644 tests/crypto/test_sha256/prj.mdef diff --git a/tests/crypto/test_sha256/Makefile b/tests/crypto/test_sha256/Makefile index 44eeaa6d573..4381308c5ad 100644 --- a/tests/crypto/test_sha256/Makefile +++ b/tests/crypto/test_sha256/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_sha256/prj.conf b/tests/crypto/test_sha256/prj.conf index c5ee243194b..de1568f6672 100644 --- a/tests/crypto/test_sha256/prj.conf +++ b/tests/crypto/test_sha256/prj.conf @@ -1,3 +1,4 @@ CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_TINYCRYPT=y CONFIG_TINYCRYPT_SHA256=y +CONFIG_MAIN_STACK_SIZE=40960 diff --git a/tests/crypto/test_sha256/prj.mdef b/tests/crypto/test_sha256/prj.mdef deleted file mode 100644 index f4b62cc882c..00000000000 --- a/tests/crypto/test_sha256/prj.mdef +++ /dev/null @@ -1,5 +0,0 @@ -% Application : test SHA256 TinyCrypt APIs - -% TASK NAME PRIO ENTRY STACK GROUPS -% ==================================================== - TASK tStartTask 5 main 40960 [EXE] diff --git a/tests/crypto/test_sha256/testcase.ini b/tests/crypto/test_sha256/testcase.ini index 8f1dd3ef465..56f623aba2d 100644 --- a/tests/crypto/test_sha256/testcase.ini +++ b/tests/crypto/test_sha256/testcase.ini @@ -1,16 +1,16 @@ [test] -tags = crypto sha256 +tags = crypto sha256 unified_capable build_only = false timeout = 10800 slow = True arch_whitelist = arm arc x86 filter = ( CONFIG_SRAM_SIZE > 32 or CONFIG_DCCM_SIZE > 32 or CONFIG_RAM_SIZE > 32 ) -kernel = micro +kernel = unified [test_nios2] -tags = crypto sha256 +tags = crypto sha256 unified_capable build_only = false timeout = 10800 slow = True arch_whitelist = nios2 -kernel = micro +kernel = unified