revises formal tests SMP only with TEST stack

11 files changed, 13 insertions, 12 deletions

diff --git a/spec/build/testsuites/validation/model-0.yml b/spec/build/testsuites/validation/model-0.yml
index 8c34e71bef..2b865b4d6f 100644
--- a/spec/build/testsuites/validation/model-0.yml
+++ b/spec/build/testsuites/validation/model-0.yml
@@ -5,7 +5,7 @@ copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 cppflags: []
 cxxflags: []
-enabled-by: true
+enabled-by: RTEMS_SMP
 features: c cprogram
 includes: []
 ldflags: []
diff --git a/testsuites/validation/tr-event-mgr-model-0.c b/testsuites/validation/tr-event-mgr-model-0.c
index d3422d70e4..b93e83622d 100644
--- a/testsuites/validation/tr-event-mgr-model-0.c
+++ b/testsuites/validation/tr-event-mgr-model-0.c
@@ -202,7 +202,7 @@ static void Worker0( rtems_task_argument arg )
 
 RTEMS_ALIGNED( RTEMS_TASK_STORAGE_ALIGNMENT ) static char WorkerStorage0[
   RTEMS_TASK_STORAGE_SIZE(
-    MAX_TLS_SIZE + RTEMS_MINIMUM_STACK_SIZE,
+    MAX_TLS_SIZE + TEST_MINIMUM_STACK_SIZE,
     WORKER_ATTRIBUTES
   )
 ];
diff --git a/testsuites/validation/tr-event-mgr-model-1.c b/testsuites/validation/tr-event-mgr-model-1.c
index 212177b9d8..60a09ad50f 100644
--- a/testsuites/validation/tr-event-mgr-model-1.c
+++ b/testsuites/validation/tr-event-mgr-model-1.c
@@ -200,7 +200,7 @@ static void Worker1( rtems_task_argument arg )
 
 RTEMS_ALIGNED( RTEMS_TASK_STORAGE_ALIGNMENT ) static char WorkerStorage1[
   RTEMS_TASK_STORAGE_SIZE(
-    MAX_TLS_SIZE + RTEMS_MINIMUM_STACK_SIZE,
+    MAX_TLS_SIZE + TEST_MINIMUM_STACK_SIZE,
     WORKER_ATTRIBUTES
   )
 ];
diff --git a/testsuites/validation/tr-event-mgr-model-2.c b/testsuites/validation/tr-event-mgr-model-2.c
index 17887cf0f2..1c0bd40325 100644
--- a/testsuites/validation/tr-event-mgr-model-2.c
+++ b/testsuites/validation/tr-event-mgr-model-2.c
@@ -213,7 +213,7 @@ static void Worker2( rtems_task_argument arg )
 
 RTEMS_ALIGNED( RTEMS_TASK_STORAGE_ALIGNMENT ) static char WorkerStorage2[
   RTEMS_TASK_STORAGE_SIZE(
-    MAX_TLS_SIZE + RTEMS_MINIMUM_STACK_SIZE,
+    MAX_TLS_SIZE + TEST_MINIMUM_STACK_SIZE,
     WORKER_ATTRIBUTES
   )
 ];
diff --git a/testsuites/validation/tr-event-mgr-model-3.c b/testsuites/validation/tr-event-mgr-model-3.c
index 36be5635f3..a22b5c665b 100644
--- a/testsuites/validation/tr-event-mgr-model-3.c
+++ b/testsuites/validation/tr-event-mgr-model-3.c
@@ -198,7 +198,7 @@ static void Worker3( rtems_task_argument arg )
 
 RTEMS_ALIGNED( RTEMS_TASK_STORAGE_ALIGNMENT ) static char WorkerStorage3[
   RTEMS_TASK_STORAGE_SIZE(
-    MAX_TLS_SIZE + RTEMS_MINIMUM_STACK_SIZE,
+    MAX_TLS_SIZE + TEST_MINIMUM_STACK_SIZE,
     WORKER_ATTRIBUTES
   )
 ];
diff --git a/testsuites/validation/tr-event-mgr-model-4.c b/testsuites/validation/tr-event-mgr-model-4.c
index eec5a45f93..250849d66c 100644
--- a/testsuites/validation/tr-event-mgr-model-4.c
+++ b/testsuites/validation/tr-event-mgr-model-4.c
@@ -219,7 +219,7 @@ static void Worker4( rtems_task_argument arg )
 
 RTEMS_ALIGNED( RTEMS_TASK_STORAGE_ALIGNMENT ) static char WorkerStorage4[
   RTEMS_TASK_STORAGE_SIZE(
-    MAX_TLS_SIZE + RTEMS_MINIMUM_STACK_SIZE,
+    MAX_TLS_SIZE + TEST_MINIMUM_STACK_SIZE,
     WORKER_ATTRIBUTES
   )
 ];
diff --git a/testsuites/validation/tr-event-mgr-model-5.c b/testsuites/validation/tr-event-mgr-model-5.c
index 3469dabe9f..19f07fce4e 100644
--- a/testsuites/validation/tr-event-mgr-model-5.c
+++ b/testsuites/validation/tr-event-mgr-model-5.c
@@ -219,7 +219,7 @@ static void Worker5( rtems_task_argument arg )
 
 RTEMS_ALIGNED( RTEMS_TASK_STORAGE_ALIGNMENT ) static char WorkerStorage5[
   RTEMS_TASK_STORAGE_SIZE(
-    MAX_TLS_SIZE + RTEMS_MINIMUM_STACK_SIZE,
+    MAX_TLS_SIZE + TEST_MINIMUM_STACK_SIZE,
     WORKER_ATTRIBUTES
   )
 ];
diff --git a/testsuites/validation/tr-event-mgr-model-6.c b/testsuites/validation/tr-event-mgr-model-6.c
index 004becb9e7..5d9807781c 100644
--- a/testsuites/validation/tr-event-mgr-model-6.c
+++ b/testsuites/validation/tr-event-mgr-model-6.c
@@ -241,7 +241,7 @@ static void Worker6( rtems_task_argument arg )
 
 RTEMS_ALIGNED( RTEMS_TASK_STORAGE_ALIGNMENT ) static char WorkerStorage6[
   RTEMS_TASK_STORAGE_SIZE(
-    MAX_TLS_SIZE + RTEMS_MINIMUM_STACK_SIZE,
+    MAX_TLS_SIZE + TEST_MINIMUM_STACK_SIZE,
     WORKER_ATTRIBUTES
   )
 ];
diff --git a/testsuites/validation/tr-event-mgr-model-7.c b/testsuites/validation/tr-event-mgr-model-7.c
index 879d7f0985..b3da580104 100644
--- a/testsuites/validation/tr-event-mgr-model-7.c
+++ b/testsuites/validation/tr-event-mgr-model-7.c
@@ -246,7 +246,7 @@ static void Worker7( rtems_task_argument arg )
 
 RTEMS_ALIGNED( RTEMS_TASK_STORAGE_ALIGNMENT ) static char WorkerStorage7[
   RTEMS_TASK_STORAGE_SIZE(
-    MAX_TLS_SIZE + RTEMS_MINIMUM_STACK_SIZE,
+    MAX_TLS_SIZE + TEST_MINIMUM_STACK_SIZE,
     WORKER_ATTRIBUTES
   )
 ];
diff --git a/testsuites/validation/tr-event-mgr-model-8.c b/testsuites/validation/tr-event-mgr-model-8.c
index d54a4215b2..fe46ba013a 100644
--- a/testsuites/validation/tr-event-mgr-model-8.c
+++ b/testsuites/validation/tr-event-mgr-model-8.c
@@ -114,7 +114,7 @@ static void TestSegment3( Context* ctx ) {
   checkTaskIs( ctx->worker_id );
   
   T_log(T_NORMAL,"@@@ 3 CALL SetProcessor 1");
-  T_eq_u32( rtems_scheduler_get_processor_maximum(), 2 );
+  T_ge_u32( rtems_scheduler_get_processor_maximum(), 2 );
   uint32_t processor = 1;
   cpu_set_t cpuset;
   CPU_ZERO(&cpuset);
@@ -164,7 +164,7 @@ static void TestSegment4( Context* ctx ) {
   checkTaskIs( ctx->runner_id );
   
   T_log(T_NORMAL,"@@@ 4 CALL SetProcessor 0");
-  T_eq_u32( rtems_scheduler_get_processor_maximum(), 2 );
+  T_ge_u32( rtems_scheduler_get_processor_maximum(), 2 );
   uint32_t processor = 0;
   cpu_set_t cpuset;
   CPU_ZERO(&cpuset);
@@ -233,7 +233,7 @@ static void Worker8( rtems_task_argument arg )
 
 RTEMS_ALIGNED( RTEMS_TASK_STORAGE_ALIGNMENT ) static char WorkerStorage8[
   RTEMS_TASK_STORAGE_SIZE(
-    MAX_TLS_SIZE + RTEMS_MINIMUM_STACK_SIZE,
+    MAX_TLS_SIZE + TEST_MINIMUM_STACK_SIZE,
     WORKER_ATTRIBUTES
   )
 ];
diff --git a/testsuites/validation/tr-event-mgr-model.h b/testsuites/validation/tr-event-mgr-model.h
index b2b2e57741..64ee8644d2 100644
--- a/testsuites/validation/tr-event-mgr-model.h
+++ b/testsuites/validation/tr-event-mgr-model.h
@@ -50,6 +50,7 @@
 #include <rtems/score/thread.h>
 
 #include <rtems/test.h>
+#include "ts-config.h"
 
 #ifdef __cplusplus
 extern "C" {