From a1bd6575947ef66f144444a9c16b0e6f5e952181 Mon Sep 17 00:00:00 2001
From: Oren Cohen <oren.cohen@arm.com>
Date: Wed, 27 Feb 2019 14:03:25 +0200
Subject: [PATCH] Test partition modification

---
 TESTS/psa/spm_server/COMPONENT_SPE/server_tests_partition1.c | 3 ++-
 TESTS/psa/spm_server/COMPONENT_SPE/server_tests_partition2.c | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/TESTS/psa/spm_server/COMPONENT_SPE/server_tests_partition1.c b/TESTS/psa/spm_server/COMPONENT_SPE/server_tests_partition1.c
index 06c4e1e651..10fca4ff2c 100644
--- a/TESTS/psa/spm_server/COMPONENT_SPE/server_tests_partition1.c
+++ b/TESTS/psa/spm_server/COMPONENT_SPE/server_tests_partition1.c
@@ -23,7 +23,6 @@
 
 extern psa_test_server_side_func test_list[];
 static size_t num_of_tests = 0;
-static psa_msg_t msg = {0};
 static void init_num_of_tests()
 {
     size_t i = 0;
@@ -37,11 +36,13 @@ static void init_num_of_tests()
 void server_part1_main(void *ptr)
 {
     psa_signal_t signals = 0;
+    psa_msg_t msg = {0};
     psa_status_t test_status = PSA_SUCCESS; // status of the api calls during the test
     psa_status_t test_result = PSA_SUCCESS; // result of the critical section of the test
     test_action_t action;
     uint32_t test_idx = 0;
 
+
     init_num_of_tests();
     while (1) {
         signals = psa_wait(CONTROL_MSK, PSA_BLOCK);
diff --git a/TESTS/psa/spm_server/COMPONENT_SPE/server_tests_partition2.c b/TESTS/psa/spm_server/COMPONENT_SPE/server_tests_partition2.c
index 3ac85cfb21..242635ce26 100644
--- a/TESTS/psa/spm_server/COMPONENT_SPE/server_tests_partition2.c
+++ b/TESTS/psa/spm_server/COMPONENT_SPE/server_tests_partition2.c
@@ -31,13 +31,12 @@
 }
 #endif
 
-static psa_msg_t msg = {0};
-
 void server_part2_main(void *ptr)
 {
     psa_signal_t signals = 0;
     size_t len = 0;
     char *str = NULL;
+    psa_msg_t msg = {0};
 
     while (1) {
         signals = psa_wait(SERVER_TESTS_PART2_WAIT_ANY_SID_MSK, PSA_BLOCK);