Give test code access to internal macros of the library

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

tests/include/test/macros.h

@@ -22,12 +22,6 @@
 #include "mbedtls/memory_buffer_alloc.h"
 #endif
 
-#if defined(TF_PSA_CRYPTO_VERSION_NUMBER)
-#include "tf_psa_crypto_common.h"
-#else
-#include "common.h"
-#endif
-
 /**
  * \brief   This macro tests the expression passed to it as a test step or
  *          individual test in a test case.

tests/src/test_common.h

@@ -33,4 +33,11 @@
  * is deemed necessary in test headers. */
 #include <test/build_info.h>
 
+/* Give test code access to internal macros of the library. */
+#if defined(TF_PSA_CRYPTO_VERSION_NUMBER)
+#include "tf_psa_crypto_common.h"
+#else
+#include "common.h"
+#endif
+
 #endif /* TEST_TEST_COMMON_H */