commit 4817eb8a0495fe08e104276e66320a7619759df4
author Raef Coles <raef.coles@arm.com> Tue Jan 18 12:33:24 2022 +0000
committer Anton Komlev <Anton.Komlev@arm.com> Tue Jan 25 14:16:37 2022 +0100
tree ca93a594db088aa3b3e186ba31bf3587a30d6c20
parent 84400cc13118a262357db8defa860a8980c37dca

Build: Revert hotfix and fix BL2 test issues

- Revert all hotfix changes
- Move PSA api test cmake from secure_fw into app cmakelists
- Change log from using DOMAIN_NS to USE_SP_LOG and invert ifdefs
- Update BL2 tests to avoid corrupting images in various scenarios
- Standardise test skip colour and fix colour name typo

Change-Id: I10a1d7ee7123f452cf56eb29bc255a4f44b7b795
Signed-off-by: Raef Coles <raef.coles@arm.com>

test/framework/test_framework_helpers.h

diff --git a/test/framework/test_framework_helpers.h b/test/framework/test_framework_helpers.h
index 1cec7e0..beb6197 100644
--- a/test/framework/test_framework_helpers.h
+++ b/test/framework/test_framework_helpers.h
@@ -22,7 +22,7 @@
     GREEN   = 32,
     YELLOW  = 33,
     BLUE    = 34,
-    MAGENDA = 35,
+    MAGENTA = 35,
     CYAN    = 36,
     WHITE   = 37,
 };

test/framework/test_log.h

diff --git a/test/framework/test_log.h b/test/framework/test_log.h
index 801d538..1a80741 100644
--- a/test/framework/test_log.h
+++ b/test/framework/test_log.h
@@ -8,21 +8,21 @@
 #ifndef __TEST_LOG_H__
 #define __TEST_LOG_H__
 
-#if (DOMAIN_NS == 1) || defined(TEST_BL2)
-#include "tfm_log_raw.h"
-#else
+#ifdef USE_SP_LOG
 #include "tfm_sp_log.h"
-#endif
+#else
+#include "tfm_log_raw.h"
+#endif /* USE_SP_LOG */
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#if (DOMAIN_NS == 1) || defined(TEST_BL2)
-#define TEST_LOG(...) tfm_log_printf(__VA_ARGS__)
-#else
+#ifdef USE_SP_LOG
 #define TEST_LOG(...) tfm_sp_log_printf(__VA_ARGS__)
-#endif
+#else
+#define TEST_LOG(...) tfm_log_printf(__VA_ARGS__)
+#endif /* USE_SP_LOG */
 
 #ifdef __cplusplus
 }