summaryrefslogtreecommitdiffstats
path: root/testsuites/tmtests
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2004-03-30 19:17:34 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2004-03-30 19:17:34 +0000
commite0f75b1573e89ddf695792e2ff032523116e9f8d (patch)
tree5fc30c6a3d32f15135d8d658e1be3b70d1115ceb /testsuites/tmtests
parent2004-03-30 Ralf Corsepius <ralf_corsepius@rtems.org> (diff)
downloadrtems-e0f75b1573e89ddf695792e2ff032523116e9f8d.tar.bz2
2004-03-30 David Querbach <querbach@realtime.bc.ca>
PR 597/tests * tm02/system.h, tm03/system.h, tm04/system.h, tm05/system.h, tm06/system.h, tm07/system.h, tm08/system.h, tm10/system.h, tm11/system.h, tm12/system.h, tm13/system.h, tm14/system.h, tm15/system.h, tm16/system.h, tm17/system.h, tm18/system.h, tm19/system.h, tm21/system.h, tm22/system.h, tm23/system.h, tm24/system.h, tm25/system.h, tm26/system.h, tm27/system.h, tm27/task1.c, tm29/system.h: The actual workspace needed by the tmtests depends on OPERATION_COUNT, but the definitions of CONFIGURE_MAXIMIM_xxx in the their system.h files do not reflect this. This results in unnecessary memory exhaustion on small-memory systems such as the SS555.
Diffstat (limited to 'testsuites/tmtests')
-rw-r--r--testsuites/tmtests/ChangeLog15
-rw-r--r--testsuites/tmtests/tm02/system.h5
-rw-r--r--testsuites/tmtests/tm03/system.h5
-rw-r--r--testsuites/tmtests/tm04/system.h2
-rw-r--r--testsuites/tmtests/tm05/system.h4
-rw-r--r--testsuites/tmtests/tm06/system.h4
-rw-r--r--testsuites/tmtests/tm07/system.h4
-rw-r--r--testsuites/tmtests/tm08/system.h4
-rw-r--r--testsuites/tmtests/tm10/system.h2
-rw-r--r--testsuites/tmtests/tm11/system.h2
-rw-r--r--testsuites/tmtests/tm12/system.h2
-rw-r--r--testsuites/tmtests/tm13/system.h2
-rw-r--r--testsuites/tmtests/tm14/system.h2
-rw-r--r--testsuites/tmtests/tm15/system.h3
-rw-r--r--testsuites/tmtests/tm16/system.h3
-rw-r--r--testsuites/tmtests/tm17/system.h3
-rw-r--r--testsuites/tmtests/tm18/system.h3
-rw-r--r--testsuites/tmtests/tm19/system.h3
-rw-r--r--testsuites/tmtests/tm21/system.h16
-rw-r--r--testsuites/tmtests/tm22/system.h2
-rw-r--r--testsuites/tmtests/tm23/system.h4
-rw-r--r--testsuites/tmtests/tm24/system.h2
-rw-r--r--testsuites/tmtests/tm25/system.h2
-rw-r--r--testsuites/tmtests/tm26/system.h2
-rw-r--r--testsuites/tmtests/tm27/system.h2
-rw-r--r--testsuites/tmtests/tm27/task1.c4
-rw-r--r--testsuites/tmtests/tm29/system.h4
27 files changed, 55 insertions, 51 deletions
diff --git a/testsuites/tmtests/ChangeLog b/testsuites/tmtests/ChangeLog
index 2c4fc55c79..54cfa25abc 100644
--- a/testsuites/tmtests/ChangeLog
+++ b/testsuites/tmtests/ChangeLog
@@ -1,3 +1,18 @@
+2004-03-30 David Querbach <querbach@realtime.bc.ca>
+
+ PR 597/tests
+ * tm02/system.h, tm03/system.h, tm04/system.h, tm05/system.h,
+ tm06/system.h, tm07/system.h, tm08/system.h, tm10/system.h,
+ tm11/system.h, tm12/system.h, tm13/system.h, tm14/system.h,
+ tm15/system.h, tm16/system.h, tm17/system.h, tm18/system.h,
+ tm19/system.h, tm21/system.h, tm22/system.h, tm23/system.h,
+ tm24/system.h, tm25/system.h, tm26/system.h, tm27/system.h,
+ tm27/task1.c, tm29/system.h: The actual workspace needed by the
+ tmtests depends on OPERATION_COUNT, but the definitions of
+ CONFIGURE_MAXIMIM_xxx in the their system.h files do not reflect
+ this. This results in unnecessary memory exhaustion on small-memory
+ systems such as the SS555.
+
2004-03-28 Ralf Corsepius <ralf_corsepius@rtems.org>
* include/timesys.h, tm01/task1.c, tm02/task1.c, tm03/task1.c,
diff --git a/testsuites/tmtests/tm02/system.h b/testsuites/tmtests/tm02/system.h
index dc9d8d467d..7fe4d1df0d 100644
--- a/testsuites/tmtests/tm02/system.h
+++ b/testsuites/tmtests/tm02/system.h
@@ -29,9 +29,8 @@ rtems_task Init(
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER
-#define CONFIGURE_MAXIMUM_TASKS 111
-#define CONFIGURE_MAXIMUM_TIMERS 110
-#define CONFIGURE_MAXIMUM_SEMAPHORES 101
+#define CONFIGURE_MAXIMUM_TASKS (2 + OPERATION_COUNT)
+#define CONFIGURE_MAXIMUM_SEMAPHORES 1
#define CONFIGURE_TICKS_PER_TIMESLICE 0
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
diff --git a/testsuites/tmtests/tm03/system.h b/testsuites/tmtests/tm03/system.h
index dc9d8d467d..b9af19f12e 100644
--- a/testsuites/tmtests/tm03/system.h
+++ b/testsuites/tmtests/tm03/system.h
@@ -29,9 +29,8 @@ rtems_task Init(
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER
-#define CONFIGURE_MAXIMUM_TASKS 111
-#define CONFIGURE_MAXIMUM_TIMERS 110
-#define CONFIGURE_MAXIMUM_SEMAPHORES 101
+#define CONFIGURE_MAXIMUM_TASKS (3 + OPERATION_COUNT)
+#define CONFIGURE_MAXIMUM_SEMAPHORES 1
#define CONFIGURE_TICKS_PER_TIMESLICE 0
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
diff --git a/testsuites/tmtests/tm04/system.h b/testsuites/tmtests/tm04/system.h
index 5b6812e71e..9cdb20e4c9 100644
--- a/testsuites/tmtests/tm04/system.h
+++ b/testsuites/tmtests/tm04/system.h
@@ -29,7 +29,7 @@ rtems_task Init(
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER
-#define CONFIGURE_MAXIMUM_TASKS 111
+#define CONFIGURE_MAXIMUM_TASKS (4 + OPERATION_COUNT)
#define CONFIGURE_MAXIMUM_SEMAPHORES 1
#define CONFIGURE_TICKS_PER_TIMESLICE 0
diff --git a/testsuites/tmtests/tm05/system.h b/testsuites/tmtests/tm05/system.h
index dc9d8d467d..ecfaa18246 100644
--- a/testsuites/tmtests/tm05/system.h
+++ b/testsuites/tmtests/tm05/system.h
@@ -29,9 +29,7 @@ rtems_task Init(
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER
-#define CONFIGURE_MAXIMUM_TASKS 111
-#define CONFIGURE_MAXIMUM_TIMERS 110
-#define CONFIGURE_MAXIMUM_SEMAPHORES 101
+#define CONFIGURE_MAXIMUM_TASKS (2 + OPERATION_COUNT)
#define CONFIGURE_TICKS_PER_TIMESLICE 0
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
diff --git a/testsuites/tmtests/tm06/system.h b/testsuites/tmtests/tm06/system.h
index dc9d8d467d..ecfaa18246 100644
--- a/testsuites/tmtests/tm06/system.h
+++ b/testsuites/tmtests/tm06/system.h
@@ -29,9 +29,7 @@ rtems_task Init(
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER
-#define CONFIGURE_MAXIMUM_TASKS 111
-#define CONFIGURE_MAXIMUM_TIMERS 110
-#define CONFIGURE_MAXIMUM_SEMAPHORES 101
+#define CONFIGURE_MAXIMUM_TASKS (2 + OPERATION_COUNT)
#define CONFIGURE_TICKS_PER_TIMESLICE 0
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
diff --git a/testsuites/tmtests/tm07/system.h b/testsuites/tmtests/tm07/system.h
index dc9d8d467d..ecfaa18246 100644
--- a/testsuites/tmtests/tm07/system.h
+++ b/testsuites/tmtests/tm07/system.h
@@ -29,9 +29,7 @@ rtems_task Init(
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER
-#define CONFIGURE_MAXIMUM_TASKS 111
-#define CONFIGURE_MAXIMUM_TIMERS 110
-#define CONFIGURE_MAXIMUM_SEMAPHORES 101
+#define CONFIGURE_MAXIMUM_TASKS (2 + OPERATION_COUNT)
#define CONFIGURE_TICKS_PER_TIMESLICE 0
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
diff --git a/testsuites/tmtests/tm08/system.h b/testsuites/tmtests/tm08/system.h
index dc9d8d467d..5241ea90bc 100644
--- a/testsuites/tmtests/tm08/system.h
+++ b/testsuites/tmtests/tm08/system.h
@@ -29,9 +29,7 @@ rtems_task Init(
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER
-#define CONFIGURE_MAXIMUM_TASKS 111
-#define CONFIGURE_MAXIMUM_TIMERS 110
-#define CONFIGURE_MAXIMUM_SEMAPHORES 101
+#define CONFIGURE_MAXIMUM_TASKS 3
#define CONFIGURE_TICKS_PER_TIMESLICE 0
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
diff --git a/testsuites/tmtests/tm10/system.h b/testsuites/tmtests/tm10/system.h
index 490c56a570..e3bfe61e67 100644
--- a/testsuites/tmtests/tm10/system.h
+++ b/testsuites/tmtests/tm10/system.h
@@ -29,7 +29,7 @@ rtems_task Init(
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER
-#define CONFIGURE_MAXIMUM_TASKS 110
+#define CONFIGURE_MAXIMUM_TASKS (2 + OPERATION_COUNT)
#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1
#define CONFIGURE_TICKS_PER_TIMESLICE 0
diff --git a/testsuites/tmtests/tm11/system.h b/testsuites/tmtests/tm11/system.h
index 27e198dd59..f1dd05920a 100644
--- a/testsuites/tmtests/tm11/system.h
+++ b/testsuites/tmtests/tm11/system.h
@@ -29,7 +29,7 @@ rtems_task Init(
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER
-#define CONFIGURE_MAXIMUM_TASKS 111
+#define CONFIGURE_MAXIMUM_TASKS (3 + OPERATION_COUNT)
#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1
#define CONFIGURE_TICKS_PER_TIMESLICE 0
diff --git a/testsuites/tmtests/tm12/system.h b/testsuites/tmtests/tm12/system.h
index 27e198dd59..f1dd05920a 100644
--- a/testsuites/tmtests/tm12/system.h
+++ b/testsuites/tmtests/tm12/system.h
@@ -29,7 +29,7 @@ rtems_task Init(
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER
-#define CONFIGURE_MAXIMUM_TASKS 111
+#define CONFIGURE_MAXIMUM_TASKS (3 + OPERATION_COUNT)
#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1
#define CONFIGURE_TICKS_PER_TIMESLICE 0
diff --git a/testsuites/tmtests/tm13/system.h b/testsuites/tmtests/tm13/system.h
index 27e198dd59..f1dd05920a 100644
--- a/testsuites/tmtests/tm13/system.h
+++ b/testsuites/tmtests/tm13/system.h
@@ -29,7 +29,7 @@ rtems_task Init(
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER
-#define CONFIGURE_MAXIMUM_TASKS 111
+#define CONFIGURE_MAXIMUM_TASKS (3 + OPERATION_COUNT)
#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1
#define CONFIGURE_TICKS_PER_TIMESLICE 0
diff --git a/testsuites/tmtests/tm14/system.h b/testsuites/tmtests/tm14/system.h
index 27e198dd59..f1dd05920a 100644
--- a/testsuites/tmtests/tm14/system.h
+++ b/testsuites/tmtests/tm14/system.h
@@ -29,7 +29,7 @@ rtems_task Init(
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER
-#define CONFIGURE_MAXIMUM_TASKS 111
+#define CONFIGURE_MAXIMUM_TASKS (3 + OPERATION_COUNT)
#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1
#define CONFIGURE_TICKS_PER_TIMESLICE 0
diff --git a/testsuites/tmtests/tm15/system.h b/testsuites/tmtests/tm15/system.h
index 27e198dd59..ecfaa18246 100644
--- a/testsuites/tmtests/tm15/system.h
+++ b/testsuites/tmtests/tm15/system.h
@@ -29,8 +29,7 @@ rtems_task Init(
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER
-#define CONFIGURE_MAXIMUM_TASKS 111
-#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1
+#define CONFIGURE_MAXIMUM_TASKS (2 + OPERATION_COUNT)
#define CONFIGURE_TICKS_PER_TIMESLICE 0
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
diff --git a/testsuites/tmtests/tm16/system.h b/testsuites/tmtests/tm16/system.h
index 27e198dd59..4d4c7f7bac 100644
--- a/testsuites/tmtests/tm16/system.h
+++ b/testsuites/tmtests/tm16/system.h
@@ -29,8 +29,7 @@ rtems_task Init(
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER
-#define CONFIGURE_MAXIMUM_TASKS 111
-#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1
+#define CONFIGURE_MAXIMUM_TASKS (3 + OPERATION_COUNT)
#define CONFIGURE_TICKS_PER_TIMESLICE 0
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
diff --git a/testsuites/tmtests/tm17/system.h b/testsuites/tmtests/tm17/system.h
index 27e198dd59..ecfaa18246 100644
--- a/testsuites/tmtests/tm17/system.h
+++ b/testsuites/tmtests/tm17/system.h
@@ -29,8 +29,7 @@ rtems_task Init(
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER
-#define CONFIGURE_MAXIMUM_TASKS 111
-#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1
+#define CONFIGURE_MAXIMUM_TASKS (2 + OPERATION_COUNT)
#define CONFIGURE_TICKS_PER_TIMESLICE 0
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
diff --git a/testsuites/tmtests/tm18/system.h b/testsuites/tmtests/tm18/system.h
index 27e198dd59..ecfaa18246 100644
--- a/testsuites/tmtests/tm18/system.h
+++ b/testsuites/tmtests/tm18/system.h
@@ -29,8 +29,7 @@ rtems_task Init(
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER
-#define CONFIGURE_MAXIMUM_TASKS 111
-#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1
+#define CONFIGURE_MAXIMUM_TASKS (2 + OPERATION_COUNT)
#define CONFIGURE_TICKS_PER_TIMESLICE 0
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
diff --git a/testsuites/tmtests/tm19/system.h b/testsuites/tmtests/tm19/system.h
index 27e198dd59..245c51c813 100644
--- a/testsuites/tmtests/tm19/system.h
+++ b/testsuites/tmtests/tm19/system.h
@@ -29,8 +29,7 @@ rtems_task Init(
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER
-#define CONFIGURE_MAXIMUM_TASKS 111
-#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1
+#define CONFIGURE_MAXIMUM_TASKS 4
#define CONFIGURE_TICKS_PER_TIMESLICE 0
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
diff --git a/testsuites/tmtests/tm21/system.h b/testsuites/tmtests/tm21/system.h
index 275c8d27c5..1339d4fb52 100644
--- a/testsuites/tmtests/tm21/system.h
+++ b/testsuites/tmtests/tm21/system.h
@@ -29,14 +29,14 @@ rtems_task Init(
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER
-#define CONFIGURE_MAXIMUM_TASKS 102
-#define CONFIGURE_MAXIMUM_TIMERS 100
-#define CONFIGURE_MAXIMUM_SEMAPHORES 100
-#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 100
-#define CONFIGURE_MAXIMUM_PARTITIONS 100
-#define CONFIGURE_MAXIMUM_REGIONS 100
-#define CONFIGURE_MAXIMUM_PORTS 100
-#define CONFIGURE_MAXIMUM_PERIODS 100
+#define CONFIGURE_MAXIMUM_TASKS (2 + OPERATION_COUNT)
+#define CONFIGURE_MAXIMUM_TIMERS OPERATION_COUNT
+#define CONFIGURE_MAXIMUM_SEMAPHORES OPERATION_COUNT
+#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES OPERATION_COUNT
+#define CONFIGURE_MAXIMUM_PARTITIONS OPERATION_COUNT
+#define CONFIGURE_MAXIMUM_REGIONS OPERATION_COUNT
+#define CONFIGURE_MAXIMUM_PORTS OPERATION_COUNT
+#define CONFIGURE_MAXIMUM_PERIODS OPERATION_COUNT
#define CONFIGURE_TICKS_PER_TIMESLICE 0
diff --git a/testsuites/tmtests/tm22/system.h b/testsuites/tmtests/tm22/system.h
index 9b542519db..565961ce49 100644
--- a/testsuites/tmtests/tm22/system.h
+++ b/testsuites/tmtests/tm22/system.h
@@ -29,7 +29,7 @@ rtems_task Init(
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER
-#define CONFIGURE_MAXIMUM_TASKS 103
+#define CONFIGURE_MAXIMUM_TASKS 4
#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1
#define CONFIGURE_TICKS_PER_TIMESLICE 0
diff --git a/testsuites/tmtests/tm23/system.h b/testsuites/tmtests/tm23/system.h
index 25f8641233..9e3729eef5 100644
--- a/testsuites/tmtests/tm23/system.h
+++ b/testsuites/tmtests/tm23/system.h
@@ -29,8 +29,8 @@ rtems_task Init(
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER
-#define CONFIGURE_MAXIMUM_TASKS 111
-#define CONFIGURE_MAXIMUM_TIMERS 110
+#define CONFIGURE_MAXIMUM_TASKS (1 + OPERATION_COUNT)
+#define CONFIGURE_MAXIMUM_TIMERS OPERATION_COUNT
#define CONFIGURE_TICKS_PER_TIMESLICE 0
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
diff --git a/testsuites/tmtests/tm24/system.h b/testsuites/tmtests/tm24/system.h
index cd9db31e0b..ecfaa18246 100644
--- a/testsuites/tmtests/tm24/system.h
+++ b/testsuites/tmtests/tm24/system.h
@@ -29,7 +29,7 @@ rtems_task Init(
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER
-#define CONFIGURE_MAXIMUM_TASKS 111
+#define CONFIGURE_MAXIMUM_TASKS (2 + OPERATION_COUNT)
#define CONFIGURE_TICKS_PER_TIMESLICE 0
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
diff --git a/testsuites/tmtests/tm25/system.h b/testsuites/tmtests/tm25/system.h
index 5b6812e71e..7fe4d1df0d 100644
--- a/testsuites/tmtests/tm25/system.h
+++ b/testsuites/tmtests/tm25/system.h
@@ -29,7 +29,7 @@ rtems_task Init(
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER
-#define CONFIGURE_MAXIMUM_TASKS 111
+#define CONFIGURE_MAXIMUM_TASKS (2 + OPERATION_COUNT)
#define CONFIGURE_MAXIMUM_SEMAPHORES 1
#define CONFIGURE_TICKS_PER_TIMESLICE 0
diff --git a/testsuites/tmtests/tm26/system.h b/testsuites/tmtests/tm26/system.h
index 5b6812e71e..b37756035f 100644
--- a/testsuites/tmtests/tm26/system.h
+++ b/testsuites/tmtests/tm26/system.h
@@ -29,7 +29,7 @@ rtems_task Init(
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER
-#define CONFIGURE_MAXIMUM_TASKS 111
+#define CONFIGURE_MAXIMUM_TASKS (6 + OPERATION_COUNT)
#define CONFIGURE_MAXIMUM_SEMAPHORES 1
#define CONFIGURE_TICKS_PER_TIMESLICE 0
diff --git a/testsuites/tmtests/tm27/system.h b/testsuites/tmtests/tm27/system.h
index f21f612279..5241ea90bc 100644
--- a/testsuites/tmtests/tm27/system.h
+++ b/testsuites/tmtests/tm27/system.h
@@ -29,7 +29,7 @@ rtems_task Init(
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER
-#define CONFIGURE_MAXIMUM_TASKS 10
+#define CONFIGURE_MAXIMUM_TASKS 3
#define CONFIGURE_TICKS_PER_TIMESLICE 0
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
diff --git a/testsuites/tmtests/tm27/task1.c b/testsuites/tmtests/tm27/task1.c
index b0cd8277f3..f3a3fdd102 100644
--- a/testsuites/tmtests/tm27/task1.c
+++ b/testsuites/tmtests/tm27/task1.c
@@ -22,6 +22,10 @@
#include <bsp.h>
+#if defined(Declarations_for_tm27)
+Declarations_for_tm27
+#endif
+
rtems_task Task_1(
rtems_task_argument argument
);
diff --git a/testsuites/tmtests/tm29/system.h b/testsuites/tmtests/tm29/system.h
index c785f9cf23..61192f2657 100644
--- a/testsuites/tmtests/tm29/system.h
+++ b/testsuites/tmtests/tm29/system.h
@@ -29,8 +29,8 @@ rtems_task Init(
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER
-#define CONFIGURE_MAXIMUM_TASKS 111
-#define CONFIGURE_MAXIMUM_PERIODS 111
+#define CONFIGURE_MAXIMUM_TASKS (2 + OPERATION_COUNT)
+#define CONFIGURE_MAXIMUM_PERIODS OPERATION_COUNT
#define CONFIGURE_TICKS_PER_TIMESLICE 0
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE