diff --git a/tests/crypto/test_aes/testcase.ini b/tests/crypto/test_aes/testcase.ini index ba6747f17f6..5eec0337b69 100644 --- 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 diff --git a/tests/crypto/test_cbc_mode/Makefile b/tests/crypto/test_cbc_mode/Makefile index 44eeaa6d573..4381308c5ad 100644 --- 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 diff --git a/tests/crypto/test_cbc_mode/prj.mdef b/tests/crypto/test_cbc_mode/prj.mdef deleted file mode 100644 index 1a068c9d2d7..00000000000 --- a/tests/crypto/test_cbc_mode/prj.mdef +++ /dev/null @@ -1,5 +0,0 @@ -% Application : test AES128-CBCMode TinyCrypt APIs - -% TASK NAME PRIO ENTRY STACK GROUPS -% ==================================================== - TASK tStartTask 5 main 1024 [EXE] diff --git a/tests/crypto/test_cbc_mode/testcase.ini b/tests/crypto/test_cbc_mode/testcase.ini index 5976d420ed4..2cd41c35fad 100644 --- 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 diff --git a/tests/crypto/test_ccm_mode/Makefile b/tests/crypto/test_ccm_mode/Makefile index 44eeaa6d573..4381308c5ad 100644 --- 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 diff --git a/tests/crypto/test_ccm_mode/prj.mdef b/tests/crypto/test_ccm_mode/prj.mdef deleted file mode 100644 index 577133057ca..00000000000 --- a/tests/crypto/test_ccm_mode/prj.mdef +++ /dev/null @@ -1,5 +0,0 @@ -% Application : test AES128-CCM mode TinyCrypt APIs - -% TASK NAME PRIO ENTRY STACK GROUPS -% ==================================================== - TASK tStartTask 5 main 1024 [EXE] diff --git a/tests/crypto/test_ccm_mode/testcase.ini b/tests/crypto/test_ccm_mode/testcase.ini index 98d3e3ac1e1..1f1bf75a053 100644 --- 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 diff --git a/tests/crypto/test_cmac_mode/Makefile b/tests/crypto/test_cmac_mode/Makefile index 44eeaa6d573..4381308c5ad 100644 --- 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 diff --git a/tests/crypto/test_cmac_mode/prj.mdef b/tests/crypto/test_cmac_mode/prj.mdef deleted file mode 100644 index 2b504204cbc..00000000000 --- a/tests/crypto/test_cmac_mode/prj.mdef +++ /dev/null @@ -1,5 +0,0 @@ -% Application : test AES-CMAC mode TinyCrypt APIs - -% TASK NAME PRIO ENTRY STACK GROUPS -% ==================================================== - TASK tStartTask 5 main 1024 [EXE] diff --git a/tests/crypto/test_cmac_mode/testcase.ini b/tests/crypto/test_cmac_mode/testcase.ini index 6d95f40eaec..768ea229d1c 100644 --- 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 diff --git a/tests/crypto/test_ctr_mode/Makefile b/tests/crypto/test_ctr_mode/Makefile index 44eeaa6d573..4381308c5ad 100644 --- 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 diff --git a/tests/crypto/test_ctr_mode/prj.mdef b/tests/crypto/test_ctr_mode/prj.mdef deleted file mode 100644 index a416288841e..00000000000 --- a/tests/crypto/test_ctr_mode/prj.mdef +++ /dev/null @@ -1,5 +0,0 @@ -% Application : test AES128-CTR mode TinyCrypt APIs - -% TASK NAME PRIO ENTRY STACK GROUPS -% ==================================================== - TASK tStartTask 5 main 1024 [EXE] diff --git a/tests/crypto/test_ctr_mode/testcase.ini b/tests/crypto/test_ctr_mode/testcase.ini index 2ec9f789319..46d1df43b71 100644 --- 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 diff --git a/tests/crypto/test_ctr_prng/Makefile b/tests/crypto/test_ctr_prng/Makefile index 4e2fd28dfd2..4381308c5ad 100644 --- 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 diff --git a/tests/crypto/test_ctr_prng/testcase.ini b/tests/crypto/test_ctr_prng/testcase.ini index cd9480e70f4..d96c44303e4 100644 --- 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 diff --git a/tests/crypto/test_ecc_dh/Makefile b/tests/crypto/test_ecc_dh/Makefile index 4e2fd28dfd2..4381308c5ad 100644 --- 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 diff --git a/tests/crypto/test_ecc_dh/testcase.ini b/tests/crypto/test_ecc_dh/testcase.ini index 80567bdee5d..df02ff03b06 100644 --- 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 diff --git a/tests/crypto/test_ecc_dsa/Makefile b/tests/crypto/test_ecc_dsa/Makefile index 4e2fd28dfd2..4381308c5ad 100644 --- 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 diff --git a/tests/crypto/test_ecc_dsa/debug.conf b/tests/crypto/test_ecc_dsa/debug.conf deleted file mode 100644 index efa1401f241..00000000000 --- a/tests/crypto/test_ecc_dsa/debug.conf +++ /dev/null @@ -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 diff --git a/tests/crypto/test_ecc_dsa/prj.conf b/tests/crypto/test_ecc_dsa/prj.conf index b5714566461..efa1401f241 100644 --- 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 diff --git a/tests/crypto/test_ecc_dsa/testcase.ini b/tests/crypto/test_ecc_dsa/testcase.ini index 41233360068..7a000e2c5ca 100644 --- 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 diff --git a/tests/crypto/test_hmac/Makefile b/tests/crypto/test_hmac/Makefile index 44eeaa6d573..4381308c5ad 100644 --- 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 diff --git a/tests/crypto/test_hmac/prj.conf b/tests/crypto/test_hmac/prj.conf index 30e85e3dc96..12a5a904414 100644 --- 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 diff --git a/tests/crypto/test_hmac/prj.mdef b/tests/crypto/test_hmac/prj.mdef deleted file mode 100644 index 5d1fb077aad..00000000000 --- a/tests/crypto/test_hmac/prj.mdef +++ /dev/null @@ -1,5 +0,0 @@ -% Application : test HMAC TinyCrypt APIs - -% TASK NAME PRIO ENTRY STACK GROUPS -% ==================================================== - TASK tStartTask 5 main 10240 [EXE] diff --git a/tests/crypto/test_hmac/testcase.ini b/tests/crypto/test_hmac/testcase.ini index e2451a9c7cc..9427bc64021 100644 --- 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 diff --git a/tests/crypto/test_hmac_prng/Makefile b/tests/crypto/test_hmac_prng/Makefile index 44eeaa6d573..4381308c5ad 100644 --- 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 diff --git a/tests/crypto/test_hmac_prng/prj.conf b/tests/crypto/test_hmac_prng/prj.conf index c5cd3b81a9d..e0ee826d379 100644 --- 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 diff --git a/tests/crypto/test_hmac_prng/prj.mdef b/tests/crypto/test_hmac_prng/prj.mdef deleted file mode 100644 index 4ded1cecf5c..00000000000 --- a/tests/crypto/test_hmac_prng/prj.mdef +++ /dev/null @@ -1,5 +0,0 @@ -% Application : test HMAC PRNG TinyCrypt APIs - -% TASK NAME PRIO ENTRY STACK GROUPS -% ==================================================== - TASK tStartTask 5 main 41200 [EXE] diff --git a/tests/crypto/test_hmac_prng/testcase.ini b/tests/crypto/test_hmac_prng/testcase.ini index 338d7dac7f9..ceeef5ef21f 100644 --- 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 diff --git a/tests/crypto/test_mbedtls/Makefile b/tests/crypto/test_mbedtls/Makefile index f2e25a17f0b..c722d034c76 100644 --- 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 diff --git a/tests/crypto/test_mbedtls/testcase.ini b/tests/crypto/test_mbedtls/testcase.ini index 0a5e31ecbd3..ddd15829ff6 100644 --- 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 diff --git a/tests/crypto/test_sha256/testcase.ini b/tests/crypto/test_sha256/testcase.ini index 56f623aba2d..402fc9bdd24 100644 --- 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