Test: Create a NS interface folder for SVCs
The test directory has SVC's declarations in different
places, which makes external app integration more
complicated. Group all the SVC's in the same folder,
and amend the build system accordingly.
Change-Id: I795d038b16a588bce7903581f7fef075d17d259d
Signed-off-by: Antonio de Angelis <antonio.deangelis@arm.com>
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index e849ebe..681eab8 100755
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -21,6 +21,7 @@
set(APP_DIR ${CMAKE_CURRENT_LIST_DIR})
get_filename_component(TFM_ROOT_DIR ${APP_DIR}/.. ABSOLUTE)
set(INTERFACE_DIR ${TFM_ROOT_DIR}/interface)
+set(TEST_INTERFACE_DIR ${TFM_ROOT_DIR}/test/interface)
#Set variables
get_filename_component(CMSIS_5_DIR ${TFM_ROOT_DIR}/../CMSIS_5 ABSOLUTE)
@@ -66,6 +67,7 @@
#Set include directories.
embedded_target_include_directories(TARGET ${PROJECT_NAME} PATH ${TFM_ROOT_DIR}/common/sct ABSOLUTE APPEND)
+embedded_target_include_directories(TARGET ${PROJECT_NAME} PATH ${TEST_INTERFACE_DIR}/include ABSOLUTE APPEND)
embedded_target_include_directories(TARGET ${PROJECT_NAME} PATH ${INTERFACE_DIR}/include ABSOLUTE APPEND)
embedded_target_include_directories(TARGET ${PROJECT_NAME} PATH ${TFM_ROOT_DIR} ABSOLUTE APPEND)
embedded_target_include_directories(TARGET ${PROJECT_NAME} PATH ${TFM_ROOT_DIR}/secure_fw/spm ABSOLUTE APPEND)
diff --git a/app/main_ns.c b/app/main_ns.c
index 4a731e5..1af2c23 100644
--- a/app/main_ns.c
+++ b/app/main_ns.c
@@ -17,10 +17,10 @@
#include "tfm_sst_svc_handler.h"
#include "tfm_ns_lock.h"
#ifdef TFM_PARTITION_TEST_CORE
-#include "test/suites/core/non_secure/svc_core_test_ns.h"
+#include "svc_core_test_ns.h"
#endif
#ifdef TFM_PARTITION_TEST_SST
-#include "test/test_services/tfm_sst_test_service/sst_test_service_svc.h"
+#include "sst_test_service_svc.h"
#endif
#ifdef TEST_FRAMEWORK_NS
#include "test/framework/integ_test.h"