tests: move crypto tests to tests/crypto

Put all tests under tests/crypto

Change-Id: Id64f0f39f7a7c6dba40161db3d8335febf545905
Signed-off-by: Anas Nashif <anas.nashif@intel.com>

70 files changed, 33 insertions, 41 deletions

diff --git a/samples/microkernel/test/test_ccm_mode/Makefile b/samples/microkernel/test/test_ccm_mode/Makefile
deleted file mode 100644
index 7c571e794..000000000
--- a/samples/microkernel/test/test_ccm_mode/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-BOARD ?= qemu_x86
-MDEF_FILE = prj.mdef
-KERNEL_TYPE = micro
-CONF_FILE = prj_$(ARCH).conf
-SOURCE_DIR = $(ZEPHYR_BASE)/samples/crypto/test_ccm_mode/
-
-include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/samples/microkernel/test/test_cmac_mode/Makefile b/samples/microkernel/test/test_cmac_mode/Makefile
deleted file mode 100644
index a0f6ef94e..000000000
--- a/samples/microkernel/test/test_cmac_mode/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-BOARD ?= qemu_x86
-MDEF_FILE = prj.mdef
-KERNEL_TYPE = micro
-CONF_FILE = prj_$(ARCH).conf
-SOURCE_DIR = $(ZEPHYR_BASE)/samples/crypto/test_cmac_mode/
-
-include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/samples/microkernel/test/test_prng/Makefile b/samples/microkernel/test/test_prng/Makefile
deleted file mode 100644
index 09cb6cdbc..000000000
--- a/samples/microkernel/test/test_prng/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-BOARD ?= qemu_x86
-MDEF_FILE = prj.mdef
-KERNEL_TYPE = micro
-CONF_FILE = prj_$(ARCH).conf
-SOURCE_DIR = $(ZEPHYR_BASE)/samples/crypto/test_prng/
-
-include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/samples/microkernel/test/test_prng/testcase.ini b/samples/microkernel/test/test_prng/testcase.ini
deleted file mode 100644
index 95c86179a..000000000
--- a/samples/microkernel/test/test_prng/testcase.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[test]
-tags = crypto sha256 hmac prng
-build_only = false
-arch_whitelist = x86 arm
-config_whitelist = !CONFIG_SOC_QUARK_SE
diff --git a/samples/microkernel/test/test_sha256/Makefile b/samples/microkernel/test/test_sha256/Makefile
deleted file mode 100644
index c5ad2b6ed..000000000
--- a/samples/microkernel/test/test_sha256/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-BOARD ?= qemu_x86
-MDEF_FILE = prj.mdef
-KERNEL_TYPE = micro
-CONF_FILE = prj_$(ARCH).conf
-SOURCE_DIR = $(ZEPHYR_BASE)/samples/crypto/test_sha256/
-
-include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/samples/microkernel/test/test_ctr/Makefile b/tests/crypto/test_aes/Makefile
index 1bae3f5fb..53ee558d8 100644
--- a/samples/microkernel/test/test_ctr/Makefile
+++ b/tests/crypto/test_aes/Makefile
@@ -2,6 +2,5 @@ BOARD ?= qemu_x86
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
 CONF_FILE = prj_$(ARCH).conf
-SOURCE_DIR = $(ZEPHYR_BASE)/samples/crypto/test_ctr/
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/samples/microkernel/test/test_aes/README.txt b/tests/crypto/test_aes/README.txt
index 2b9660ca4..2b9660ca4 100644
--- a/samples/microkernel/test/test_aes/README.txt
+++ b/tests/crypto/test_aes/README.txt
diff --git a/samples/microkernel/test/test_aes/prj.mdef b/tests/crypto/test_aes/prj.mdef
index d657d1888..d657d1888 100644
--- a/samples/microkernel/test/test_aes/prj.mdef
+++ b/tests/crypto/test_aes/prj.mdef
diff --git a/samples/microkernel/test/test_aes/prj_arm.conf b/tests/crypto/test_aes/prj_arm.conf
index cd711875c..cd711875c 100644
--- a/samples/microkernel/test/test_aes/prj_arm.conf
+++ b/tests/crypto/test_aes/prj_arm.conf
diff --git a/samples/microkernel/test/test_aes/prj_x86.conf b/tests/crypto/test_aes/prj_x86.conf
index cd711875c..cd711875c 100644
--- a/samples/microkernel/test/test_aes/prj_x86.conf
+++ b/tests/crypto/test_aes/prj_x86.conf
diff --git a/samples/crypto/test_aes/Makefile b/tests/crypto/test_aes/src/Makefile
index 6c19478db..6c19478db 100644
--- a/samples/crypto/test_aes/Makefile
+++ b/tests/crypto/test_aes/src/Makefile
diff --git a/samples/crypto/test_aes/test_aes.c b/tests/crypto/test_aes/src/test_aes.c
index 34b04c850..34b04c850 100644
--- a/samples/crypto/test_aes/test_aes.c
+++ b/tests/crypto/test_aes/src/test_aes.c
diff --git a/samples/microkernel/test/test_aes/testcase.ini b/tests/crypto/test_aes/testcase.ini
index cd45d51eb..cd45d51eb 100644
--- a/samples/microkernel/test/test_aes/testcase.ini
+++ b/tests/crypto/test_aes/testcase.ini
diff --git a/samples/microkernel/test/test_aes/Makefile b/tests/crypto/test_cbc/Makefile
index 24f8e3f68..53ee558d8 100644
--- a/samples/microkernel/test/test_aes/Makefile
+++ b/tests/crypto/test_cbc/Makefile
@@ -2,6 +2,5 @@ BOARD ?= qemu_x86
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
 CONF_FILE = prj_$(ARCH).conf
-SOURCE_DIR = $(ZEPHYR_BASE)/samples/crypto/test_aes/
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/samples/microkernel/test/test_cbc/README.txt b/tests/crypto/test_cbc/README.txt
index 9a9702331..9a9702331 100644
--- a/samples/microkernel/test/test_cbc/README.txt
+++ b/tests/crypto/test_cbc/README.txt
diff --git a/samples/microkernel/test/test_cbc/prj.mdef b/tests/crypto/test_cbc/prj.mdef
index c99932bb3..c99932bb3 100644
--- a/samples/microkernel/test/test_cbc/prj.mdef
+++ b/tests/crypto/test_cbc/prj.mdef
diff --git a/samples/microkernel/test/test_cbc/prj_arm.conf b/tests/crypto/test_cbc/prj_arm.conf
index 256d435bc..256d435bc 100644
--- a/samples/microkernel/test/test_cbc/prj_arm.conf
+++ b/tests/crypto/test_cbc/prj_arm.conf
diff --git a/samples/microkernel/test/test_cbc/prj_x86.conf b/tests/crypto/test_cbc/prj_x86.conf
index 256d435bc..256d435bc 100644
--- a/samples/microkernel/test/test_cbc/prj_x86.conf
+++ b/tests/crypto/test_cbc/prj_x86.conf
diff --git a/samples/crypto/test_cbc/Makefile b/tests/crypto/test_cbc/src/Makefile
index 4997bfd5d..4997bfd5d 100644
--- a/samples/crypto/test_cbc/Makefile
+++ b/tests/crypto/test_cbc/src/Makefile
diff --git a/samples/crypto/test_cbc/test_cbc_mode.c b/tests/crypto/test_cbc/src/test_cbc_mode.c
index 8a42d53d3..8a42d53d3 100644
--- a/samples/crypto/test_cbc/test_cbc_mode.c
+++ b/tests/crypto/test_cbc/src/test_cbc_mode.c
diff --git a/samples/microkernel/test/test_cbc/testcase.ini b/tests/crypto/test_cbc/testcase.ini
index 8902ef650..a006dea06 100644
--- a/samples/microkernel/test/test_cbc/testcase.ini
+++ b/tests/crypto/test_cbc/testcase.ini
@@ -1,4 +1,4 @@
 [test]
 tags = crypto aes cbc
 build_only = false
-arch_whitelist = x86 arm
+platform_whitelist = qemu_x86 qemu_cortex_m3
diff --git a/samples/microkernel/test/test_cbc/Makefile b/tests/crypto/test_ccm_mode/Makefile
index 0f33d52cf..53ee558d8 100644
--- a/samples/microkernel/test/test_cbc/Makefile
+++ b/tests/crypto/test_ccm_mode/Makefile
@@ -2,6 +2,5 @@ BOARD ?= qemu_x86
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
 CONF_FILE = prj_$(ARCH).conf
-SOURCE_DIR = $(ZEPHYR_BASE)/samples/crypto/test_cbc/
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/samples/microkernel/test/test_ccm_mode/README.txt b/tests/crypto/test_ccm_mode/README.txt
index b8afa4470..b8afa4470 100644
--- a/samples/microkernel/test/test_ccm_mode/README.txt
+++ b/tests/crypto/test_ccm_mode/README.txt
diff --git a/samples/microkernel/test/test_ccm_mode/prj.mdef b/tests/crypto/test_ccm_mode/prj.mdef
index 3ca375d09..3ca375d09 100644
--- a/samples/microkernel/test/test_ccm_mode/prj.mdef
+++ b/tests/crypto/test_ccm_mode/prj.mdef
diff --git a/samples/microkernel/test/test_ccm_mode/prj_arm.conf b/tests/crypto/test_ccm_mode/prj_arm.conf
index 6ba75de51..6ba75de51 100644
--- a/samples/microkernel/test/test_ccm_mode/prj_arm.conf
+++ b/tests/crypto/test_ccm_mode/prj_arm.conf
diff --git a/samples/microkernel/test/test_ccm_mode/prj_x86.conf b/tests/crypto/test_ccm_mode/prj_x86.conf
index 6ba75de51..6ba75de51 100644
--- a/samples/microkernel/test/test_ccm_mode/prj_x86.conf
+++ b/tests/crypto/test_ccm_mode/prj_x86.conf
diff --git a/samples/crypto/test_ccm_mode/Makefile b/tests/crypto/test_ccm_mode/src/Makefile
index 0fd65c751..0fd65c751 100644
--- a/samples/crypto/test_ccm_mode/Makefile
+++ b/tests/crypto/test_ccm_mode/src/Makefile
diff --git a/samples/crypto/test_ccm_mode/test_ccm_mode.c b/tests/crypto/test_ccm_mode/src/test_ccm_mode.c
index 6646c8317..6646c8317 100644
--- a/samples/crypto/test_ccm_mode/test_ccm_mode.c
+++ b/tests/crypto/test_ccm_mode/src/test_ccm_mode.c
diff --git a/samples/microkernel/test/test_ccm_mode/testcase.ini b/tests/crypto/test_ccm_mode/testcase.ini
index 5a0a01543..e19716187 100644
--- a/samples/microkernel/test/test_ccm_mode/testcase.ini
+++ b/tests/crypto/test_ccm_mode/testcase.ini
@@ -1,4 +1,4 @@
 [test]
 tags = crypto aes ccm
 build_only = false
-arch_whitelist = x86 arm
+platform_whitelist = qemu_x86 qemu_cortex_m3
diff --git a/samples/microkernel/test/test_hmac/Makefile b/tests/crypto/test_cmac_mode/Makefile
index dd5069ea3..53ee558d8 100644
--- a/samples/microkernel/test/test_hmac/Makefile
+++ b/tests/crypto/test_cmac_mode/Makefile
@@ -2,6 +2,5 @@ BOARD ?= qemu_x86
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
 CONF_FILE = prj_$(ARCH).conf
-SOURCE_DIR = $(ZEPHYR_BASE)/samples/crypto/test_hmac/
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/samples/microkernel/test/test_cmac_mode/README.txt b/tests/crypto/test_cmac_mode/README.txt
index a046c588c..a046c588c 100644
--- a/samples/microkernel/test/test_cmac_mode/README.txt
+++ b/tests/crypto/test_cmac_mode/README.txt
diff --git a/samples/microkernel/test/test_cmac_mode/prj.mdef b/tests/crypto/test_cmac_mode/prj.mdef
index 1d5653ca6..1d5653ca6 100644
--- a/samples/microkernel/test/test_cmac_mode/prj.mdef
+++ b/tests/crypto/test_cmac_mode/prj.mdef
diff --git a/samples/microkernel/test/test_cmac_mode/prj_arm.conf b/tests/crypto/test_cmac_mode/prj_arm.conf
index 63f018c6f..63f018c6f 100644
--- a/samples/microkernel/test/test_cmac_mode/prj_arm.conf
+++ b/tests/crypto/test_cmac_mode/prj_arm.conf
diff --git a/samples/microkernel/test/test_cmac_mode/prj_x86.conf b/tests/crypto/test_cmac_mode/prj_x86.conf
index 63f018c6f..63f018c6f 100644
--- a/samples/microkernel/test/test_cmac_mode/prj_x86.conf
+++ b/tests/crypto/test_cmac_mode/prj_x86.conf
diff --git a/samples/crypto/test_cmac_mode/Makefile b/tests/crypto/test_cmac_mode/src/Makefile
index 83d9cb5cd..83d9cb5cd 100644
--- a/samples/crypto/test_cmac_mode/Makefile
+++ b/tests/crypto/test_cmac_mode/src/Makefile
diff --git a/samples/crypto/test_cmac_mode/test_cmac_mode.c b/tests/crypto/test_cmac_mode/src/test_cmac_mode.c
index 4ea6214cc..4ea6214cc 100644
--- a/samples/crypto/test_cmac_mode/test_cmac_mode.c
+++ b/tests/crypto/test_cmac_mode/src/test_cmac_mode.c
diff --git a/samples/microkernel/test/test_cmac_mode/testcase.ini b/tests/crypto/test_cmac_mode/testcase.ini
index cf0370146..2d519d860 100644
--- a/samples/microkernel/test/test_cmac_mode/testcase.ini
+++ b/tests/crypto/test_cmac_mode/testcase.ini
@@ -1,4 +1,4 @@
 [test]
 tags = crypto aes cmac
 build_only = false
-arch_whitelist = x86 arm
+platform_whitelist = qemu_x86 qemu_cortex_m3
diff --git a/tests/crypto/test_ctr/Makefile b/tests/crypto/test_ctr/Makefile
new file mode 100644
index 000000000..53ee558d8
--- /dev/null
+++ b/tests/crypto/test_ctr/Makefile
@@ -0,0 +1,6 @@
+BOARD ?= qemu_x86
+MDEF_FILE = prj.mdef
+KERNEL_TYPE = micro
+CONF_FILE = prj_$(ARCH).conf
+
+include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/samples/microkernel/test/test_ctr/README.txt b/tests/crypto/test_ctr/README.txt
index bf18dc9ef..bf18dc9ef 100644
--- a/samples/microkernel/test/test_ctr/README.txt
+++ b/tests/crypto/test_ctr/README.txt
diff --git a/samples/microkernel/test/test_ctr/prj.mdef b/tests/crypto/test_ctr/prj.mdef
index 46959cc82..46959cc82 100644
--- a/samples/microkernel/test/test_ctr/prj.mdef
+++ b/tests/crypto/test_ctr/prj.mdef
diff --git a/samples/microkernel/test/test_ctr/prj_arm.conf b/tests/crypto/test_ctr/prj_arm.conf
index 31d80e2a2..31d80e2a2 100644
--- a/samples/microkernel/test/test_ctr/prj_arm.conf
+++ b/tests/crypto/test_ctr/prj_arm.conf
diff --git a/samples/microkernel/test/test_ctr/prj_x86.conf b/tests/crypto/test_ctr/prj_x86.conf
index 31d80e2a2..31d80e2a2 100644
--- a/samples/microkernel/test/test_ctr/prj_x86.conf
+++ b/tests/crypto/test_ctr/prj_x86.conf
diff --git a/samples/crypto/test_ctr/Makefile b/tests/crypto/test_ctr/src/Makefile
index e21da9c8a..e21da9c8a 100644
--- a/samples/crypto/test_ctr/Makefile
+++ b/tests/crypto/test_ctr/src/Makefile
diff --git a/samples/crypto/test_ctr/test_ctr_mode.c b/tests/crypto/test_ctr/src/test_ctr_mode.c
index d49874a7b..d49874a7b 100644
--- a/samples/crypto/test_ctr/test_ctr_mode.c
+++ b/tests/crypto/test_ctr/src/test_ctr_mode.c
diff --git a/samples/microkernel/test/test_ctr/testcase.ini b/tests/crypto/test_ctr/testcase.ini
index 33e319ef8..93c5cc5d9 100644
--- a/samples/microkernel/test/test_ctr/testcase.ini
+++ b/tests/crypto/test_ctr/testcase.ini
@@ -1,4 +1,4 @@
 [test]
 tags = crypto aes ctr
 build_only = false
-arch_whitelist = x86 arm
+platform_whitelist = qemu_x86 qemu_cortex_m3
diff --git a/tests/crypto/test_hmac/Makefile b/tests/crypto/test_hmac/Makefile
new file mode 100644
index 000000000..53ee558d8
--- /dev/null
+++ b/tests/crypto/test_hmac/Makefile
@@ -0,0 +1,6 @@
+BOARD ?= qemu_x86
+MDEF_FILE = prj.mdef
+KERNEL_TYPE = micro
+CONF_FILE = prj_$(ARCH).conf
+
+include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/samples/microkernel/test/test_hmac/README.txt b/tests/crypto/test_hmac/README.txt
index 3c19225e5..3c19225e5 100644
--- a/samples/microkernel/test/test_hmac/README.txt
+++ b/tests/crypto/test_hmac/README.txt
diff --git a/samples/microkernel/test/test_hmac/pjr_arm.conf b/tests/crypto/test_hmac/pjr_arm.conf
index 6d38ab41e..6d38ab41e 100644
--- a/samples/microkernel/test/test_hmac/pjr_arm.conf
+++ b/tests/crypto/test_hmac/pjr_arm.conf
diff --git a/samples/microkernel/test/test_hmac/prj.mdef b/tests/crypto/test_hmac/prj.mdef
index d829c2b36..d829c2b36 100644
--- a/samples/microkernel/test/test_hmac/prj.mdef
+++ b/tests/crypto/test_hmac/prj.mdef
diff --git a/samples/microkernel/test/test_hmac/prj_arm.conf b/tests/crypto/test_hmac/prj_arm.conf
index 30e85e3dc..30e85e3dc 100644
--- a/samples/microkernel/test/test_hmac/prj_arm.conf
+++ b/tests/crypto/test_hmac/prj_arm.conf
diff --git a/samples/microkernel/test/test_hmac/prj_x86.conf b/tests/crypto/test_hmac/prj_x86.conf
index 30e85e3dc..30e85e3dc 100644
--- a/samples/microkernel/test/test_hmac/prj_x86.conf
+++ b/tests/crypto/test_hmac/prj_x86.conf
diff --git a/samples/crypto/test_hmac/Makefile b/tests/crypto/test_hmac/src/Makefile
index 0472a2d3b..0472a2d3b 100644
--- a/samples/crypto/test_hmac/Makefile
+++ b/tests/crypto/test_hmac/src/Makefile
diff --git a/samples/crypto/test_hmac/test_hmac.c b/tests/crypto/test_hmac/src/test_hmac.c
index 2a110a2ef..2a110a2ef 100644
--- a/samples/crypto/test_hmac/test_hmac.c
+++ b/tests/crypto/test_hmac/src/test_hmac.c
diff --git a/samples/microkernel/test/test_hmac/testcase.ini b/tests/crypto/test_hmac/testcase.ini
index 3bd578aae..f971b49fe 100644
--- a/samples/microkernel/test/test_hmac/testcase.ini
+++ b/tests/crypto/test_hmac/testcase.ini
@@ -2,3 +2,4 @@
 tags = crypto sha256 hmac
 build_only = false
 arch_whitelist = x86 arm
+platform_whitelist = qemu_x86 qemu_cortex_m3
diff --git a/tests/crypto/test_prng/Makefile b/tests/crypto/test_prng/Makefile
new file mode 100644
index 000000000..53ee558d8
--- /dev/null
+++ b/tests/crypto/test_prng/Makefile
@@ -0,0 +1,6 @@
+BOARD ?= qemu_x86
+MDEF_FILE = prj.mdef
+KERNEL_TYPE = micro
+CONF_FILE = prj_$(ARCH).conf
+
+include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/samples/microkernel/test/test_prng/README.txt b/tests/crypto/test_prng/README.txt
index 7a52c64c5..7a52c64c5 100644
--- a/samples/microkernel/test/test_prng/README.txt
+++ b/tests/crypto/test_prng/README.txt
diff --git a/samples/microkernel/test/test_prng/prj.mdef b/tests/crypto/test_prng/prj.mdef
index 003b5ccb5..003b5ccb5 100644
--- a/samples/microkernel/test/test_prng/prj.mdef
+++ b/tests/crypto/test_prng/prj.mdef
diff --git a/samples/microkernel/test/test_prng/prj_arm.conf b/tests/crypto/test_prng/prj_arm.conf
index c5cd3b81a..c5cd3b81a 100644
--- a/samples/microkernel/test/test_prng/prj_arm.conf
+++ b/tests/crypto/test_prng/prj_arm.conf
diff --git a/samples/microkernel/test/test_prng/prj_x86.conf b/tests/crypto/test_prng/prj_x86.conf
index c5cd3b81a..c5cd3b81a 100644
--- a/samples/microkernel/test/test_prng/prj_x86.conf
+++ b/tests/crypto/test_prng/prj_x86.conf
diff --git a/samples/crypto/test_prng/Makefile b/tests/crypto/test_prng/src/Makefile
index a3ddad15b..a3ddad15b 100644
--- a/samples/crypto/test_prng/Makefile
+++ b/tests/crypto/test_prng/src/Makefile
diff --git a/samples/crypto/test_prng/test_hmac_prng.c b/tests/crypto/test_prng/src/test_hmac_prng.c
index 795c09243..795c09243 100644
--- a/samples/crypto/test_prng/test_hmac_prng.c
+++ b/tests/crypto/test_prng/src/test_hmac_prng.c
diff --git a/tests/crypto/test_prng/testcase.ini b/tests/crypto/test_prng/testcase.ini
new file mode 100644
index 000000000..754995f7e
--- /dev/null
+++ b/tests/crypto/test_prng/testcase.ini
@@ -0,0 +1,4 @@
+[test]
+tags = crypto sha256 hmac prng
+build_only = false
+platform_whitelist = qemu_x86 qemu_cortex_m3
diff --git a/tests/crypto/test_sha256/Makefile b/tests/crypto/test_sha256/Makefile
new file mode 100644
index 000000000..53ee558d8
--- /dev/null
+++ b/tests/crypto/test_sha256/Makefile
@@ -0,0 +1,6 @@
+BOARD ?= qemu_x86
+MDEF_FILE = prj.mdef
+KERNEL_TYPE = micro
+CONF_FILE = prj_$(ARCH).conf
+
+include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/samples/microkernel/test/test_sha256/README.txt b/tests/crypto/test_sha256/README.txt
index be11b4210..be11b4210 100644
--- a/samples/microkernel/test/test_sha256/README.txt
+++ b/tests/crypto/test_sha256/README.txt
diff --git a/samples/microkernel/test/test_sha256/prj.mdef b/tests/crypto/test_sha256/prj.mdef
index cd0e5812d..cd0e5812d 100644
--- a/samples/microkernel/test/test_sha256/prj.mdef
+++ b/tests/crypto/test_sha256/prj.mdef
diff --git a/samples/microkernel/test/test_sha256/prj_arm.conf b/tests/crypto/test_sha256/prj_arm.conf
index c5ee24319..c5ee24319 100644
--- a/samples/microkernel/test/test_sha256/prj_arm.conf
+++ b/tests/crypto/test_sha256/prj_arm.conf
diff --git a/samples/microkernel/test/test_sha256/prj_x86.conf b/tests/crypto/test_sha256/prj_x86.conf
index c5ee24319..c5ee24319 100644
--- a/samples/microkernel/test/test_sha256/prj_x86.conf
+++ b/tests/crypto/test_sha256/prj_x86.conf
diff --git a/samples/crypto/test_sha256/Makefile b/tests/crypto/test_sha256/src/Makefile
index bf765f329..bf765f329 100644
--- a/samples/crypto/test_sha256/Makefile
+++ b/tests/crypto/test_sha256/src/Makefile
diff --git a/samples/crypto/test_sha256/test_sha256.c b/tests/crypto/test_sha256/src/test_sha256.c
index 271f7ec55..271f7ec55 100644
--- a/samples/crypto/test_sha256/test_sha256.c
+++ b/tests/crypto/test_sha256/src/test_sha256.c
diff --git a/samples/microkernel/test/test_sha256/testcase.ini b/tests/crypto/test_sha256/testcase.ini
index c1f6b2040..c1f6b2040 100644
--- a/samples/microkernel/test/test_sha256/testcase.ini
+++ b/tests/crypto/test_sha256/testcase.ini