tx-support

2 files changed, 33 insertions, 13 deletions

diff --git a/testsuites/validation/ts-config.h b/testsuites/validation/ts-config.h
index adfadf6ad0..08df51fc02 100644
--- a/testsuites/validation/ts-config.h
+++ b/testsuites/validation/ts-config.h
@@ -65,8 +65,28 @@ extern "C" {
 #define TEST_MINIMUM_STACK_SIZE ( 4 * RTEMS_MINIMUM_STACK_SIZE )
 #endif
 
+#define TEST_MAXIMUM_BARRIERS 7
+
+#define TEST_MAXIMUM_MESSAGE_QUEUES 3
+
+#define TEST_MAXIMUM_PARTITIONS 4
+
+#define TEST_MAXIMUM_PERIODS 2
+
+#define TEST_MAXIMUM_SEMAPHORES 6
+
+#define TEST_MAXIMUM_TASKS 32
+
 #define TEST_MAXIMUM_TIMERS 10
 
+#define TEST_MAXIMUM_USER_EXTENSIONS 5
+
+#define TEST_TICKS_PER_TIMESLICE 1
+
+void *test_task_stack_allocate( size_t size );
+
+void test_task_stack_deallocate( void *stack );
+
 /** @} */
 
 #ifdef __cplusplus
diff --git a/testsuites/validation/ts-default.h b/testsuites/validation/ts-default.h
index d1f2394091..d2c4ccb036 100644
--- a/testsuites/validation/ts-default.h
+++ b/testsuites/validation/ts-default.h
@@ -48,7 +48,7 @@
 #define MAX_TLS_SIZE RTEMS_ALIGN_UP( 64, RTEMS_TASK_STORAGE_ALIGNMENT )
 #endif
 
-#define MAX_TASKS 32
+#define MAX_TASKS ( TEST_MAXIMUM_TASKS - 1 )
 
 #define TASK_ATTRIBUTES RTEMS_FLOATING_POINT
 
@@ -125,7 +125,7 @@ static void Init( rtems_task_argument arg )
   rtems_fatal( RTEMS_FATAL_SOURCE_EXIT, (uint32_t) exit_code );
 }
 
-static void *task_stack_allocate( size_t size )
+void *test_task_stack_allocate( size_t size )
 {
   if ( size > sizeof( task_storage[ 0 ] ) ) {
     return NULL;
@@ -134,7 +134,7 @@ static void *task_stack_allocate( size_t size )
   return rtems_chain_get_unprotected( &free_task_storage );
 }
 
-static void task_stack_deallocate( void *stack )
+void test_task_stack_deallocate( void *stack )
 {
   rtems_chain_append_unprotected(
     &free_task_storage,
@@ -146,28 +146,28 @@ static void task_stack_deallocate( void *stack )
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 #endif
 
-#define CONFIGURE_MAXIMUM_BARRIERS 3
+#define CONFIGURE_MAXIMUM_BARRIERS TEST_MAXIMUM_BARRIERS
 
-#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 3
+#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES TEST_MAXIMUM_MESSAGE_QUEUES
 
-#define CONFIGURE_MAXIMUM_PARTITIONS 3
+#define CONFIGURE_MAXIMUM_PARTITIONS TEST_MAXIMUM_PARTITIONS
 
-#define CONFIGURE_MAXIMUM_PERIODS 3
+#define CONFIGURE_MAXIMUM_PERIODS TEST_MAXIMUM_PERIODS
 
-#define CONFIGURE_MAXIMUM_SEMAPHORES 6
+#define CONFIGURE_MAXIMUM_SEMAPHORES TEST_MAXIMUM_SEMAPHORES
 
-#define CONFIGURE_MAXIMUM_TASKS ( 1 + MAX_TASKS )
+#define CONFIGURE_MAXIMUM_TASKS TEST_MAXIMUM_TASKS
 
 #define CONFIGURE_MINIMUM_TASKS_WITH_USER_PROVIDED_STORAGE \
   CONFIGURE_MAXIMUM_TASKS
 
 #define CONFIGURE_MAXIMUM_TIMERS TEST_MAXIMUM_TIMERS
 
-#define CONFIGURE_MAXIMUM_USER_EXTENSIONS 5
+#define CONFIGURE_MAXIMUM_USER_EXTENSIONS TEST_MAXIMUM_USER_EXTENSIONS
 
 #define CONFIGURE_MICROSECONDS_PER_TICK TEST_MICROSECONDS_PER_TICK
 
-#define CONFIGURE_TICKS_PER_TIMESLICE 1
+#define CONFIGURE_TICKS_PER_TIMESLICE TEST_TICKS_PER_TIMESLICE
 
 #define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 0
 
@@ -179,9 +179,9 @@ static void task_stack_deallocate( void *stack )
 
 #define CONFIGURE_TASK_STACK_ALLOCATOR_AVOIDS_WORK_SPACE
 
-#define CONFIGURE_TASK_STACK_ALLOCATOR task_stack_allocate
+#define CONFIGURE_TASK_STACK_ALLOCATOR test_task_stack_allocate
 
-#define CONFIGURE_TASK_STACK_DEALLOCATOR task_stack_deallocate
+#define CONFIGURE_TASK_STACK_DEALLOCATOR test_task_stack_deallocate
 
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE