commit 7937ad5a64d1ebe6c42dfe276a6ae73ccb6a118c
author Devaraj Ranganna <devaraj.ranganna@arm.com> Fri Feb 21 13:05:10 2020 +0000
committer Anton Komlev <Anton.Komlev@arm.com> Mon Feb 15 20:52:12 2021 +0000
tree 25a1976c34c0f1c6ac8b3decccdf5ebc12a728b4
parent b8dd171c0b2bf0f73e5a4dd7faff45b7f3349484

Test: Move test_suite_err_t to a new header

A non secure application that links a TF-M regression tests binary
only needs

    enum test_suite_err_t tfm_non_secure_client_run_tests(void);

from test_framework_integ_test.h in order to trigger the tests.
But test_suite_err_t is defined in test_framework.h which pulls
in other unused header files, adding unnecessary dependencies.

This commit moves test_suite_err_t into a new header,
test_framework_error_codes.h, so that a non-secure application
only needs to copy over two header files to its project.

Signed-off-by: Devaraj Ranganna <devaraj.ranganna@arm.com>
Change-Id: I57fd3141ebce0754e1cea5d5d4ee352a2948e32f

test/framework/test_framework.h

diff --git a/test/framework/test_framework.h b/test/framework/test_framework.h
index 605fda1..fa27390 100644
--- a/test/framework/test_framework.h
+++ b/test/framework/test_framework.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2019, Arm Limited. All rights reserved.
+ * Copyright (c) 2017-2021, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
@@ -14,6 +14,7 @@
 
 #include "tfm_log_raw.h"
 #include "test_framework_helpers.h"
+#include "test_framework_error_codes.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -66,17 +67,6 @@
     enum test_status_t val;        /*!< Test suite result \ref test_result_t */
 };
 
-enum test_suite_err_t {
-    TEST_SUITE_ERR_NO_ERROR = 0,           /*!< No error */
-    TEST_SUITE_ERR_INVALID_DATA = 1,       /*!< Invalid test suite if any of the
-                                            *   pointers is NULL
-                                            */
-    TEST_SUITE_ERR_INVALID_TEST_DATA = 2,  /*!< Invalid test if any of the
-                                            *  pointers is NULL
-                                            */
-    TEST_SUITE_ERR_TEST_FAILED  = 3,       /*!< Last executed test has failed */
-};
-
 /**
  * \brief Translates the test suite error into a string.
  *

test/framework/test_framework_error_codes.h

diff --git a/test/framework/test_framework_error_codes.h b/test/framework/test_framework_error_codes.h
new file mode 100644
index 0000000..b534223
--- /dev/null
+++ b/test/framework/test_framework_error_codes.h
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2021, Arm Limited. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ */
+
+#ifndef __TEST_FRAMEWORK_ERROR_CODES_H__
+#define __TEST_FRAMEWORK_ERROR_CODES_H__
+
+enum test_suite_err_t {
+    TEST_SUITE_ERR_NO_ERROR = 0,           /*!< No error */
+    TEST_SUITE_ERR_INVALID_DATA = 1,       /*!< Invalid test suite if any of the
+                                            *   pointers is NULL
+                                            */
+    TEST_SUITE_ERR_INVALID_TEST_DATA = 2,  /*!< Invalid test if any of the
+                                            *  pointers is NULL
+                                            */
+    TEST_SUITE_ERR_TEST_FAILED  = 3,       /*!< Last executed test has failed */
+};
+
+#endif /* __TEST_FRAMEWORK_ERROR_CODES_H__ */

test/framework/test_framework_integ_test.h

diff --git a/test/framework/test_framework_integ_test.h b/test/framework/test_framework_integ_test.h
index acbcfc0..6760574 100644
--- a/test/framework/test_framework_integ_test.h
+++ b/test/framework/test_framework_integ_test.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018, Arm Limited. All rights reserved.
+ * Copyright (c) 2017-2021, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
@@ -8,7 +8,7 @@
 #ifndef __INTEG_TEST_H__
 #define __INTEG_TEST_H__
 
-#include "test_framework.h"
+#include "test_framework_error_codes.h"
 
 #ifdef __cplusplus
 extern "C" {