[PATCH 1/2] sptests: Disable Newlib reentrancy

[Sebastian Huber]

From: Matt Joyce <matthew.joyce at embedded-brains.de>

Update #4560.
---
 testsuites/sptests/sp01/system.h                 | 7 +++++++
 testsuites/sptests/spstkalloc02/init.c           | 7 +++++++
 testsuites/sptests/spstkalloc02/spstkalloc02.doc | 2 +-
 testsuites/sptests/sptls03/init.c                | 7 +++++++
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/testsuites/sptests/sp01/system.h b/testsuites/sptests/sp01/system.h
index 46fa76f1e4..782fd929a7 100644
--- a/testsuites/sptests/sp01/system.h
+++ b/testsuites/sptests/sp01/system.h
@@ -48,6 +48,13 @@ rtems_task Task_1_through_3(
  */
 #define CONFIGURE_APPLICATION_DISABLE_FILESYSTEM
 
+/*
+ * This test requires full control over the present thread-local objects.  In
+ * certain Newlib configurations, the Newlib reentrancy support may add
+ * thread-local objects.
+ */
+#define CONFIGURE_DISABLE_NEWLIB_REENTRANCY
+
 #define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
 
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
diff --git a/testsuites/sptests/spstkalloc02/init.c b/testsuites/sptests/spstkalloc02/init.c
index 5e5db20f0f..3613a6a563 100644
--- a/testsuites/sptests/spstkalloc02/init.c
+++ b/testsuites/sptests/spstkalloc02/init.c
@@ -138,6 +138,13 @@ static rtems_task Init(rtems_task_argument argument)
  */
 #define CONFIGURE_APPLICATION_DISABLE_FILESYSTEM
 
+/*
+ * This test requires full control over the present thread-local objects.  This
+ * is necessary for the custom stack allocator below.  In certain Newlib
+ * configurations, the Newlib reentrancy support may add thread-local objects.
+ */
+#define CONFIGURE_DISABLE_NEWLIB_REENTRANCY
+
 #define CONFIGURE_MAXIMUM_TASKS TASK_COUNT
 
 #define CONFIGURE_TASK_STACK_ALLOCATOR_INIT task_stack_init
diff --git a/testsuites/sptests/spstkalloc02/spstkalloc02.doc b/testsuites/sptests/spstkalloc02/spstkalloc02.doc
index a2dd0357ba..f4c09b4558 100644
--- a/testsuites/sptests/spstkalloc02/spstkalloc02.doc
+++ b/testsuites/sptests/spstkalloc02/spstkalloc02.doc
@@ -26,7 +26,7 @@
 
 This file describes the directives and concepts tested by this test set.
 
-test set name:  spstkalloc01
+test set name:  spstkalloc02
 
 The test expects that no thread-local object is present.
 
diff --git a/testsuites/sptests/sptls03/init.c b/testsuites/sptests/sptls03/init.c
index 2b60828808..6625327f45 100644
--- a/testsuites/sptests/sptls03/init.c
+++ b/testsuites/sptests/sptls03/init.c
@@ -68,6 +68,13 @@ static void Init(rtems_task_argument arg)
  */
 #define CONFIGURE_APPLICATION_DISABLE_FILESYSTEM
 
+/*
+ * This test requires full control over the present thread-local objects.  In
+ * certain Newlib configurations, the Newlib reentrancy support may add
+ * thread-local objects.
+ */
+#define CONFIGURE_DISABLE_NEWLIB_REENTRANCY
+
 #define CONFIGURE_MAXIMUM_TASKS 1
 
 #define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
-- 
2.35.3