tests: crypto: convert all tests to unified kernel

Change-Id: Id7c1c6bbb0b04eb190cc44c1fbb557722871fc0f Signed-off-by: Anas Nashif <anas.nashif@intel.com>
2016-10-30 17:26:49 -04:00 · 2016-10-30 17:26:49 -04:00 · fcb54aa96b
commit fcb54aa96b
parent a32579749b
32 changed files with 31 additions and 80 deletions
--- a/tests/crypto/test_aes/testcase.ini
+++ b/tests/crypto/test_aes/testcase.ini
@ -1,4 +1,4 @@
 [test]
-tags = crypto aes unified_capable
+tags = crypto aes
 build_only = false
 kernel = unified
--- a/tests/crypto/test_cbc_mode/Makefile
+++ b/tests/crypto/test_cbc_mode/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
--- a/tests/crypto/test_cbc_mode/prj.mdef
+++ b/tests/crypto/test_cbc_mode/prj.mdef
@ -1,5 +0,0 @@
-% Application       : test AES128-CBCMode TinyCrypt APIs
-
-% TASK NAME          PRIO ENTRY           STACK GROUPS
-% ====================================================
-  TASK tStartTask       5 main             1024 [EXE]
--- a/tests/crypto/test_cbc_mode/testcase.ini
+++ b/tests/crypto/test_cbc_mode/testcase.ini
@ -3,4 +3,4 @@ tags = crypto aes cbc
 build_only = false
 # FIXME: why?
 platform_whitelist = qemu_x86 qemu_cortex_m3
-kernel = micro
+kernel = unified
--- a/tests/crypto/test_ccm_mode/Makefile
+++ b/tests/crypto/test_ccm_mode/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
--- a/tests/crypto/test_ccm_mode/prj.mdef
+++ b/tests/crypto/test_ccm_mode/prj.mdef
@ -1,5 +0,0 @@
-% Application       : test AES128-CCM mode TinyCrypt APIs
-
-% TASK NAME          PRIO ENTRY           STACK GROUPS
-% ====================================================
-  TASK tStartTask       5 main             1024 [EXE]
--- a/tests/crypto/test_ccm_mode/testcase.ini
+++ b/tests/crypto/test_ccm_mode/testcase.ini
@ -3,4 +3,4 @@ tags = crypto aes ccm
 build_only = false
 # FIXME: why?
 platform_whitelist = qemu_x86 qemu_cortex_m3
-kernel = micro
+kernel = unified
--- a/tests/crypto/test_cmac_mode/Makefile
+++ b/tests/crypto/test_cmac_mode/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
--- a/tests/crypto/test_cmac_mode/prj.mdef
+++ b/tests/crypto/test_cmac_mode/prj.mdef
@ -1,5 +0,0 @@
-% Application       : test AES-CMAC mode TinyCrypt APIs
-
-% TASK NAME          PRIO ENTRY           STACK GROUPS
-% ====================================================
-  TASK tStartTask       5 main             1024 [EXE]
--- a/tests/crypto/test_cmac_mode/testcase.ini
+++ b/tests/crypto/test_cmac_mode/testcase.ini
@ -3,4 +3,4 @@ tags = crypto aes cmac
 build_only = false
 # FIXME: why?
 platform_whitelist = qemu_x86 qemu_cortex_m3
-kernel = micro
+kernel = unified
--- a/tests/crypto/test_ctr_mode/Makefile
+++ b/tests/crypto/test_ctr_mode/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
--- a/tests/crypto/test_ctr_mode/prj.mdef
+++ b/tests/crypto/test_ctr_mode/prj.mdef
@ -1,5 +0,0 @@
-% Application       : test AES128-CTR mode TinyCrypt APIs
-
-% TASK NAME          PRIO ENTRY           STACK GROUPS
-% ====================================================
-  TASK tStartTask       5 main             1024 [EXE]
--- a/tests/crypto/test_ctr_mode/testcase.ini
+++ b/tests/crypto/test_ctr_mode/testcase.ini
@ -3,4 +3,4 @@ tags = crypto aes ctr
 build_only = false
 # FIXME: why?
 platform_whitelist = qemu_x86 qemu_cortex_m3
-kernel = micro
+kernel = unified
--- a/tests/crypto/test_ctr_prng/Makefile
+++ b/tests/crypto/test_ctr_prng/Makefile
@ -1,5 +1,5 @@
 BOARD ?= qemu_x86
-KERNEL_TYPE = nano
+KERNEL_TYPE = unified
 CONF_FILE = prj.conf

 include $(ZEPHYR_BASE)/Makefile.inc
--- a/tests/crypto/test_ctr_prng/testcase.ini
+++ b/tests/crypto/test_ctr_prng/testcase.ini
@ -1,4 +1,4 @@
 [test]
 tags = crypto ctr prng
 build_only = false
-kernel = nano
+kernel = unified
--- a/tests/crypto/test_ecc_dh/Makefile
+++ b/tests/crypto/test_ecc_dh/Makefile
@ -1,5 +1,5 @@
 BOARD ?= qemu_x86
-KERNEL_TYPE = nano
+KERNEL_TYPE = unified
 CONF_FILE = prj.conf

 include $(ZEPHYR_BASE)/Makefile.inc
--- a/tests/crypto/test_ecc_dh/testcase.ini
+++ b/tests/crypto/test_ecc_dh/testcase.ini
@ -1,4 +1,4 @@
 [test]
 tags = crypto ecc dh
 build_only = false
-kernel = nano
+kernel = unified
--- a/tests/crypto/test_ecc_dsa/Makefile
+++ b/tests/crypto/test_ecc_dsa/Makefile
@ -1,5 +1,5 @@
 BOARD ?= qemu_x86
-KERNEL_TYPE = nano
+KERNEL_TYPE = unified
 CONF_FILE = prj.conf

 include $(ZEPHYR_BASE)/Makefile.inc
--- a/tests/crypto/test_ecc_dsa/debug.conf
+++ b/tests/crypto/test_ecc_dsa/debug.conf
@ -1,8 +0,0 @@
-CONFIG_TEST_RANDOM_GENERATOR=y
-
-CONFIG_TINYCRYPT=y
-CONFIG_TINYCRYPT_SHA256=y
-CONFIG_TINYCRYPT_ECC_DH=y
-CONFIG_TINYCRYPT_ECC_DSA=y
-
-CONFIG_MAIN_STACK_SIZE=4096
--- a/tests/crypto/test_ecc_dsa/prj.conf
+++ b/tests/crypto/test_ecc_dsa/prj.conf
@ -5,4 +5,4 @@ CONFIG_TINYCRYPT_SHA256=y
 CONFIG_TINYCRYPT_ECC_DH=y
 CONFIG_TINYCRYPT_ECC_DSA=y

-CONFIG_MAIN_STACK_SIZE=2048
+CONFIG_MAIN_STACK_SIZE=4096
--- a/tests/crypto/test_ecc_dsa/testcase.ini
+++ b/tests/crypto/test_ecc_dsa/testcase.ini
@ -1,13 +1,5 @@
 [test]
 tags = crypto ecc dsa
 build_only = false
-kernel = nano
-#Do not run for debug daily build
-filter = not (CONFIG_DEBUG and (CONFIG_SOC_QUARK_D2000 or CONFIG_BOARD_QEMU_X86))
-
-[test_dbg]
-tags = crypto ecc dsa debug
-build_only = false
-kernel = nano
-extra_args = CONF_FILE=debug.conf
-filter = CONFIG_DEBUG and CONFIG_BOARD_QEMU_X86
+kernel = unified
+platform_whitelist = qemu_x86 qemu_cortex_m3
--- a/tests/crypto/test_hmac/Makefile
+++ b/tests/crypto/test_hmac/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
--- a/tests/crypto/test_hmac/prj.conf
+++ b/tests/crypto/test_hmac/prj.conf
@ -2,3 +2,4 @@ CONFIG_TEST_RANDOM_GENERATOR=y
 CONFIG_TINYCRYPT=y
 CONFIG_TINYCRYPT_SHA256=y
 CONFIG_TINYCRYPT_SHA256_HMAC=y
+CONFIG_MAIN_STACK_SIZE=10240
--- a/tests/crypto/test_hmac/prj.mdef
+++ b/tests/crypto/test_hmac/prj.mdef
@ -1,5 +0,0 @@
-% Application       : test HMAC TinyCrypt APIs
-
-% TASK NAME          PRIO ENTRY           STACK GROUPS
-% ====================================================
-  TASK tStartTask       5 main            10240 [EXE]
--- a/tests/crypto/test_hmac/testcase.ini
+++ b/tests/crypto/test_hmac/testcase.ini
@ -1,3 +1,4 @@
 [test]
 tags = crypto sha256 hmac
-kernel = micro
+kernel = unified
+platform_whitelist = qemu_x86 qemu_cortex_m3
--- a/tests/crypto/test_hmac_prng/Makefile
+++ b/tests/crypto/test_hmac_prng/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
--- a/tests/crypto/test_hmac_prng/prj.conf
+++ b/tests/crypto/test_hmac_prng/prj.conf
@ -1,4 +1,5 @@
 CONFIG_TEST_RANDOM_GENERATOR=y
+CONFIG_MAIN_STACK_SIZE=40960
 CONFIG_TINYCRYPT=y
 CONFIG_TINYCRYPT_SHA256=y
 CONFIG_TINYCRYPT_SHA256_HMAC=y
--- a/tests/crypto/test_hmac_prng/prj.mdef
+++ b/tests/crypto/test_hmac_prng/prj.mdef
@ -1,5 +0,0 @@
-% Application       : test HMAC PRNG TinyCrypt APIs
-
-% TASK NAME          PRIO ENTRY           STACK GROUPS
-% ====================================================
-  TASK tStartTask       5 main            41200 [EXE]
--- a/tests/crypto/test_hmac_prng/testcase.ini
+++ b/tests/crypto/test_hmac_prng/testcase.ini
@ -3,4 +3,4 @@ tags = crypto sha256 hmac prng
 build_only = false
 # FIXME: why?
 platform_whitelist = qemu_x86 qemu_cortex_m3
-kernel = micro
+kernel = unified
--- a/tests/crypto/test_mbedtls/Makefile
+++ b/tests/crypto/test_mbedtls/Makefile
@ -1,4 +1,4 @@
-KERNEL_TYPE = nano
+KERNEL_TYPE = unified
 BOARD ?= qemu_x86
 CONF_FILE = prj.conf

--- a/tests/crypto/test_mbedtls/testcase.ini
+++ b/tests/crypto/test_mbedtls/testcase.ini
@ -1,11 +1,11 @@
 [test]
 tags = crypto mbedtls
-kernel = nano
-filter =  ( CONFIG_SRAM_SIZE > 32 or CONFIG_DCCM_SIZE > 32 or
-	    CONFIG_RAM_SIZE > 32 )
+kernel = unified
+filter =  ( CONFIG_SRAM_SIZE >= 32 or CONFIG_DCCM_SIZE >= 32 or
+	    CONFIG_RAM_SIZE >= 32 )

 [test_nios]
 tags = crypto mbedtls
-kernel = nano
+kernel = unified
 slow = true
 arch_whitelist = nios2
--- a/tests/crypto/test_sha256/testcase.ini
+++ b/tests/crypto/test_sha256/testcase.ini
@ -1,5 +1,5 @@
 [test]
-tags = crypto sha256 unified_capable
+tags = crypto sha256
 build_only = false
 timeout = 10800
 slow = True
@ -8,7 +8,7 @@ filter = ( CONFIG_SRAM_SIZE > 32 or CONFIG_DCCM_SIZE > 32 or CONFIG_RAM_SIZE > 3
 kernel = unified

 [test_nios2]
-tags = crypto sha256 unified_capable
+tags = crypto sha256
 build_only = false
 timeout = 10800
 slow = True