From 777213c0fbaadcca74c87ff4b43eda4f9e644f7d Mon Sep 17 00:00:00 2001 From: Andrew Boie Date: Thu, 2 Jan 2020 17:22:09 -0800 Subject: [PATCH] samples: drivers: crypto: fix test failure The regular expressions used by this test to determine success or failure get confounded if the log subsystem drops the wrong messages due to buffers being full. Just use minimal logging which synchronously logs everything. Signed-off-by: Andrew Boie --- samples/drivers/crypto/prj.conf | 1 + samples/drivers/crypto/prj_mtls_shim.conf | 1 + samples/drivers/crypto/sample.yaml | 12 ++++++------ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/samples/drivers/crypto/prj.conf b/samples/drivers/crypto/prj.conf index d8e263cb53b..0861aca6a3f 100644 --- a/samples/drivers/crypto/prj.conf +++ b/samples/drivers/crypto/prj.conf @@ -7,3 +7,4 @@ CONFIG_CRYPTO=y CONFIG_CRYPTO_TINYCRYPT_SHIM=y CONFIG_CRYPTO_LOG_LEVEL_DBG=y CONFIG_LOG=y +CONFIG_LOG_MINIMAL=y diff --git a/samples/drivers/crypto/prj_mtls_shim.conf b/samples/drivers/crypto/prj_mtls_shim.conf index 57de734ace3..8df2e6d54ed 100644 --- a/samples/drivers/crypto/prj_mtls_shim.conf +++ b/samples/drivers/crypto/prj_mtls_shim.conf @@ -1,4 +1,5 @@ CONFIG_LOG=y +CONFIG_LOG_MINIMAL=y CONFIG_MBEDTLS=y CONFIG_MBEDTLS_BUILTIN=y CONFIG_MBEDTLS_CFG_FILE="config-tls-generic.h" diff --git a/samples/drivers/crypto/sample.yaml b/samples/drivers/crypto/sample.yaml index 71ca51d78fa..aaa852436f4 100644 --- a/samples/drivers/crypto/sample.yaml +++ b/samples/drivers/crypto/sample.yaml @@ -15,15 +15,15 @@ tests: type: multi_line regex: - ".*: Cipher Sample" - - ".*main: CBC Mode" - - ".*main: CTR Mode" - - ".*main: CCM Mode" + - ".*: CBC Mode" + - ".*: CTR Mode" + - ".*: CCM Mode" sample.drivers.crypto.mbedtls.micro: tags: crypto harness_config: type: multi_line regex: - ".*: Cipher Sample" - - ".*main: CBC Mode" - - ".*main: CTR Mode" - - ".*main: CCM Mode" + - ".*: CBC Mode" + - ".*: CTR Mode" + - ".*: CCM Mode"