From b7852c27b14a286dc03fbcc5303252ee33cc717c Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Thu, 18 Nov 1999 13:58:02 +0000
Subject: Patch rtems-rc-19991105-3.diff.gz from Ralf Corsepius
 <corsepiu@faw.uni-ulm.de> which turns OPERATION_COUNT into a configure time
 option.

---
 c/src/tests/tmtests/configure.in         |  3 +++
 c/src/tests/tmtests/include/timesys.h    | 15 ++++++---------
 c/src/tests/tmtests/tm01/Makefile.in     |  3 ++-
 c/src/tests/tmtests/tm02/Makefile.in     |  3 ++-
 c/src/tests/tmtests/tm03/Makefile.in     |  3 ++-
 c/src/tests/tmtests/tm04/Makefile.in     |  3 ++-
 c/src/tests/tmtests/tm05/Makefile.in     |  3 ++-
 c/src/tests/tmtests/tm06/Makefile.in     |  3 ++-
 c/src/tests/tmtests/tm07/Makefile.in     |  3 ++-
 c/src/tests/tmtests/tm08/Makefile.in     |  3 ++-
 c/src/tests/tmtests/tm09/Makefile.in     |  3 ++-
 c/src/tests/tmtests/tm10/Makefile.in     |  3 ++-
 c/src/tests/tmtests/tm11/Makefile.in     |  3 ++-
 c/src/tests/tmtests/tm12/Makefile.in     |  3 ++-
 c/src/tests/tmtests/tm13/Makefile.in     |  3 ++-
 c/src/tests/tmtests/tm14/Makefile.in     |  3 ++-
 c/src/tests/tmtests/tm15/Makefile.in     |  3 ++-
 c/src/tests/tmtests/tm16/Makefile.in     |  3 ++-
 c/src/tests/tmtests/tm17/Makefile.in     |  3 ++-
 c/src/tests/tmtests/tm18/Makefile.in     |  3 ++-
 c/src/tests/tmtests/tm19/Makefile.in     |  3 ++-
 c/src/tests/tmtests/tm20/Makefile.in     |  3 ++-
 c/src/tests/tmtests/tm21/Makefile.in     |  3 ++-
 c/src/tests/tmtests/tm22/Makefile.in     |  3 ++-
 c/src/tests/tmtests/tm23/Makefile.in     |  3 ++-
 c/src/tests/tmtests/tm24/Makefile.in     |  3 ++-
 c/src/tests/tmtests/tm25/Makefile.in     |  3 ++-
 c/src/tests/tmtests/tm26/Makefile.in     |  3 ++-
 c/src/tests/tmtests/tm27/Makefile.in     |  3 ++-
 c/src/tests/tmtests/tm28/Makefile.in     |  3 ++-
 c/src/tests/tmtests/tm29/Makefile.in     |  3 ++-
 c/src/tests/tmtests/tmck/Makefile.in     |  3 ++-
 c/src/tests/tmtests/tmoverhd/Makefile.in |  3 ++-
 testsuites/tmtests/include/timesys.h     | 15 ++++++---------
 34 files changed, 77 insertions(+), 49 deletions(-)

diff --git a/c/src/tests/tmtests/configure.in b/c/src/tests/tmtests/configure.in
index 7ea7ab3532..9541a0bcc7 100644
--- a/c/src/tests/tmtests/configure.in
+++ b/c/src/tests/tmtests/configure.in
@@ -37,6 +37,9 @@ AC_SUBST(CC_CFLAGS_DEBUG_V)
 AC_SUBST(CC_CFLAGS_PROFILE_V)
 AC_SUBST(CC_LDFLAGS_PROFILE_V)
 
+OPERATION_COUNT=${OPERATION_COUNT-100}
+AC_SUBST(OPERATION_COUNT)
+
 # Try to explicitly list a Makefile here
 AC_OUTPUT( 
 Makefile
diff --git a/c/src/tests/tmtests/include/timesys.h b/c/src/tests/tmtests/include/timesys.h
index 936dd69805..6ba5ea7d17 100644
--- a/c/src/tests/tmtests/include/timesys.h
+++ b/c/src/tests/tmtests/include/timesys.h
@@ -21,15 +21,14 @@
  *  blocking tasks to determine the execution time of blocking
  *  services.  By default, the blocking time of 100 tasks will
  *  be measured.  Small targets often do not have enough memory
- *  to create 100 tasks.  By setting the BSP_MAXIMUM_OPERATION_COUNT
- *  to a lower number (typically 10), all of the time tests can be
- *  run.
+ *  to create 100 tasks.  By overriding the default OPERATION_COUNT
+ *  with a lower number (typically 10 or less), all of the time tests
+ *  can usually be run.  This is stil not very fine-grained but
+ *  is enough to significantly reduce memory consumption.
  */
 
-#ifndef BSP_MAXIMUM_OPERATION_COUNT
+#ifndef OPERATION_COUNT
 #define OPERATION_COUNT 100
-#else
-#define OPERATION_COUNT BSP_MAXIMUM_OPERATION_COUNT
 #endif
 
 /*
@@ -41,10 +40,8 @@
  *  not increase memory usage -- only execution time.
  */
 
-#ifndef BSP_ITERATION_COUNT
+#ifndef IT_COUNT
 #define IT_COUNT        100
-#else
-#define IT_COUNT BSP_ITERATION_COUNT
 #endif
 
 /* functions */
diff --git a/c/src/tests/tmtests/tm01/Makefile.in b/c/src/tests/tmtests/tm01/Makefile.in
index 49ab921ea6..2952ee8c3f 100644
--- a/c/src/tests/tmtests/tm01/Makefile.in
+++ b/c/src/tests/tmtests/tm01/Makefile.in
@@ -44,8 +44,9 @@ PACKHEX = @PACKHEX@
 # (OPTIONAL) Add local stuff here using +=
 #
 
+OPERATION_COUNT = @OPERATION_COUNT@
 DEFINES +=
-CPPFLAGS += -I$(srcdir)/../include
+CPPFLAGS += -I$(srcdir)/../include -DOPERATION_COUNT=$(OPERATION_COUNT)
 CFLAGS +=
 
 LD_PATHS +=
diff --git a/c/src/tests/tmtests/tm02/Makefile.in b/c/src/tests/tmtests/tm02/Makefile.in
index a400a70a07..c708d5f156 100644
--- a/c/src/tests/tmtests/tm02/Makefile.in
+++ b/c/src/tests/tmtests/tm02/Makefile.in
@@ -44,8 +44,9 @@ PACKHEX = @PACKHEX@
 # (OPTIONAL) Add local stuff here using +=
 #
 
+OPERATION_COUNT = @OPERATION_COUNT@
 DEFINES +=
-CPPFLAGS += -I$(srcdir)/../include
+CPPFLAGS += -I$(srcdir)/../include -DOPERATION_COUNT=$(OPERATION_COUNT)
 CFLAGS +=
 
 LD_PATHS +=
diff --git a/c/src/tests/tmtests/tm03/Makefile.in b/c/src/tests/tmtests/tm03/Makefile.in
index ed6426d3ff..046b610ac0 100644
--- a/c/src/tests/tmtests/tm03/Makefile.in
+++ b/c/src/tests/tmtests/tm03/Makefile.in
@@ -44,8 +44,9 @@ PACKHEX = @PACKHEX@
 # (OPTIONAL) Add local stuff here using +=
 #
 
+OPERATION_COUNT = @OPERATION_COUNT@
 DEFINES +=
-CPPFLAGS += -I$(srcdir)/../include
+CPPFLAGS += -I$(srcdir)/../include -DOPERATION_COUNT=$(OPERATION_COUNT)
 CFLAGS +=
 
 LD_PATHS +=
diff --git a/c/src/tests/tmtests/tm04/Makefile.in b/c/src/tests/tmtests/tm04/Makefile.in
index 05b5f3f776..434313113b 100644
--- a/c/src/tests/tmtests/tm04/Makefile.in
+++ b/c/src/tests/tmtests/tm04/Makefile.in
@@ -44,8 +44,9 @@ PACKHEX = @PACKHEX@
 # (OPTIONAL) Add local stuff here using +=
 #
 
+OPERATION_COUNT = @OPERATION_COUNT@
 DEFINES +=
-CPPFLAGS += -I$(srcdir)/../include
+CPPFLAGS += -I$(srcdir)/../include -DOPERATION_COUNT=$(OPERATION_COUNT)
 CFLAGS +=
 
 LD_PATHS +=
diff --git a/c/src/tests/tmtests/tm05/Makefile.in b/c/src/tests/tmtests/tm05/Makefile.in
index 0d65ed930d..e7628ad5b5 100644
--- a/c/src/tests/tmtests/tm05/Makefile.in
+++ b/c/src/tests/tmtests/tm05/Makefile.in
@@ -44,8 +44,9 @@ PACKHEX = @PACKHEX@
 # (OPTIONAL) Add local stuff here using +=
 #
 
+OPERATION_COUNT = @OPERATION_COUNT@
 DEFINES +=
-CPPFLAGS += -I$(srcdir)/../include
+CPPFLAGS += -I$(srcdir)/../include -DOPERATION_COUNT=$(OPERATION_COUNT)
 CFLAGS +=
 
 LD_PATHS +=
diff --git a/c/src/tests/tmtests/tm06/Makefile.in b/c/src/tests/tmtests/tm06/Makefile.in
index 76ebd502f3..0b02709d49 100644
--- a/c/src/tests/tmtests/tm06/Makefile.in
+++ b/c/src/tests/tmtests/tm06/Makefile.in
@@ -44,8 +44,9 @@ PACKHEX = @PACKHEX@
 # (OPTIONAL) Add local stuff here using +=
 #
 
+OPERATION_COUNT = @OPERATION_COUNT@
 DEFINES +=
-CPPFLAGS += -I$(srcdir)/../include
+CPPFLAGS += -I$(srcdir)/../include -DOPERATION_COUNT=$(OPERATION_COUNT)
 CFLAGS +=
 
 LD_PATHS +=
diff --git a/c/src/tests/tmtests/tm07/Makefile.in b/c/src/tests/tmtests/tm07/Makefile.in
index ddd37cd9ea..c32ae4b22b 100644
--- a/c/src/tests/tmtests/tm07/Makefile.in
+++ b/c/src/tests/tmtests/tm07/Makefile.in
@@ -44,8 +44,9 @@ PACKHEX = @PACKHEX@
 # (OPTIONAL) Add local stuff here using +=
 #
 
+OPERATION_COUNT = @OPERATION_COUNT@
 DEFINES +=
-CPPFLAGS += -I$(srcdir)/../include
+CPPFLAGS += -I$(srcdir)/../include -DOPERATION_COUNT=$(OPERATION_COUNT)
 CFLAGS +=
 
 LD_PATHS +=
diff --git a/c/src/tests/tmtests/tm08/Makefile.in b/c/src/tests/tmtests/tm08/Makefile.in
index b4b07f5d22..5ae6a4c896 100644
--- a/c/src/tests/tmtests/tm08/Makefile.in
+++ b/c/src/tests/tmtests/tm08/Makefile.in
@@ -44,8 +44,9 @@ PACKHEX = @PACKHEX@
 # (OPTIONAL) Add local stuff here using +=
 #
 
+OPERATION_COUNT = @OPERATION_COUNT@
 DEFINES +=
-CPPFLAGS += -I$(srcdir)/../include
+CPPFLAGS += -I$(srcdir)/../include -DOPERATION_COUNT=$(OPERATION_COUNT)
 CFLAGS +=
 
 LD_PATHS +=
diff --git a/c/src/tests/tmtests/tm09/Makefile.in b/c/src/tests/tmtests/tm09/Makefile.in
index 5c0df5cf2e..8f1abfcc18 100644
--- a/c/src/tests/tmtests/tm09/Makefile.in
+++ b/c/src/tests/tmtests/tm09/Makefile.in
@@ -44,8 +44,9 @@ PACKHEX = @PACKHEX@
 # (OPTIONAL) Add local stuff here using +=
 #
 
+OPERATION_COUNT = @OPERATION_COUNT@
 DEFINES +=
-CPPFLAGS += -I$(srcdir)/../include
+CPPFLAGS += -I$(srcdir)/../include -DOPERATION_COUNT=$(OPERATION_COUNT)
 CFLAGS +=
 
 LD_PATHS +=
diff --git a/c/src/tests/tmtests/tm10/Makefile.in b/c/src/tests/tmtests/tm10/Makefile.in
index 16beda922f..d03b779659 100644
--- a/c/src/tests/tmtests/tm10/Makefile.in
+++ b/c/src/tests/tmtests/tm10/Makefile.in
@@ -44,8 +44,9 @@ PACKHEX = @PACKHEX@
 # (OPTIONAL) Add local stuff here using +=
 #
 
+OPERATION_COUNT = @OPERATION_COUNT@
 DEFINES +=
-CPPFLAGS += -I$(srcdir)/../include
+CPPFLAGS += -I$(srcdir)/../include -DOPERATION_COUNT=$(OPERATION_COUNT)
 CFLAGS +=
 
 LD_PATHS +=
diff --git a/c/src/tests/tmtests/tm11/Makefile.in b/c/src/tests/tmtests/tm11/Makefile.in
index 026231d1cb..595fab4d80 100644
--- a/c/src/tests/tmtests/tm11/Makefile.in
+++ b/c/src/tests/tmtests/tm11/Makefile.in
@@ -44,8 +44,9 @@ PACKHEX = @PACKHEX@
 # (OPTIONAL) Add local stuff here using +=
 #
 
+OPERATION_COUNT = @OPERATION_COUNT@
 DEFINES +=
-CPPFLAGS += -I$(srcdir)/../include
+CPPFLAGS += -I$(srcdir)/../include -DOPERATION_COUNT=$(OPERATION_COUNT)
 CFLAGS +=
 
 LD_PATHS +=
diff --git a/c/src/tests/tmtests/tm12/Makefile.in b/c/src/tests/tmtests/tm12/Makefile.in
index 9680f20a9b..792b8d3e55 100644
--- a/c/src/tests/tmtests/tm12/Makefile.in
+++ b/c/src/tests/tmtests/tm12/Makefile.in
@@ -44,8 +44,9 @@ PACKHEX = @PACKHEX@
 # (OPTIONAL) Add local stuff here using +=
 #
 
+OPERATION_COUNT = @OPERATION_COUNT@
 DEFINES +=
-CPPFLAGS += -I$(srcdir)/../include
+CPPFLAGS += -I$(srcdir)/../include -DOPERATION_COUNT=$(OPERATION_COUNT)
 CFLAGS +=
 
 LD_PATHS +=
diff --git a/c/src/tests/tmtests/tm13/Makefile.in b/c/src/tests/tmtests/tm13/Makefile.in
index 9b0f478a72..ef3916a03a 100644
--- a/c/src/tests/tmtests/tm13/Makefile.in
+++ b/c/src/tests/tmtests/tm13/Makefile.in
@@ -44,8 +44,9 @@ PACKHEX = @PACKHEX@
 # (OPTIONAL) Add local stuff here using +=
 #
 
+OPERATION_COUNT = @OPERATION_COUNT@
 DEFINES +=
-CPPFLAGS += -I$(srcdir)/../include
+CPPFLAGS += -I$(srcdir)/../include -DOPERATION_COUNT=$(OPERATION_COUNT)
 CFLAGS +=
 
 LD_PATHS +=
diff --git a/c/src/tests/tmtests/tm14/Makefile.in b/c/src/tests/tmtests/tm14/Makefile.in
index c4dc7f8dce..3add509490 100644
--- a/c/src/tests/tmtests/tm14/Makefile.in
+++ b/c/src/tests/tmtests/tm14/Makefile.in
@@ -44,8 +44,9 @@ PACKHEX = @PACKHEX@
 # (OPTIONAL) Add local stuff here using +=
 #
 
+OPERATION_COUNT = @OPERATION_COUNT@
 DEFINES +=
-CPPFLAGS += -I$(srcdir)/../include
+CPPFLAGS += -I$(srcdir)/../include -DOPERATION_COUNT=$(OPERATION_COUNT)
 CFLAGS +=
 
 LD_PATHS +=
diff --git a/c/src/tests/tmtests/tm15/Makefile.in b/c/src/tests/tmtests/tm15/Makefile.in
index 5348ca98ef..c521aaec61 100644
--- a/c/src/tests/tmtests/tm15/Makefile.in
+++ b/c/src/tests/tmtests/tm15/Makefile.in
@@ -44,8 +44,9 @@ PACKHEX = @PACKHEX@
 # (OPTIONAL) Add local stuff here using +=
 #
 
+OPERATION_COUNT = @OPERATION_COUNT@
 DEFINES +=
-CPPFLAGS += -I$(srcdir)/../include
+CPPFLAGS += -I$(srcdir)/../include -DOPERATION_COUNT=$(OPERATION_COUNT)
 CFLAGS +=
 
 LD_PATHS +=
diff --git a/c/src/tests/tmtests/tm16/Makefile.in b/c/src/tests/tmtests/tm16/Makefile.in
index a2339ff234..c43b410b6b 100644
--- a/c/src/tests/tmtests/tm16/Makefile.in
+++ b/c/src/tests/tmtests/tm16/Makefile.in
@@ -44,8 +44,9 @@ PACKHEX = @PACKHEX@
 # (OPTIONAL) Add local stuff here using +=
 #
 
+OPERATION_COUNT = @OPERATION_COUNT@
 DEFINES +=
-CPPFLAGS += -I$(srcdir)/../include
+CPPFLAGS += -I$(srcdir)/../include -DOPERATION_COUNT=$(OPERATION_COUNT)
 CFLAGS +=
 
 LD_PATHS +=
diff --git a/c/src/tests/tmtests/tm17/Makefile.in b/c/src/tests/tmtests/tm17/Makefile.in
index a929059363..1d774e12ad 100644
--- a/c/src/tests/tmtests/tm17/Makefile.in
+++ b/c/src/tests/tmtests/tm17/Makefile.in
@@ -44,8 +44,9 @@ PACKHEX = @PACKHEX@
 # (OPTIONAL) Add local stuff here using +=
 #
 
+OPERATION_COUNT = @OPERATION_COUNT@
 DEFINES +=
-CPPFLAGS += -I$(srcdir)/../include
+CPPFLAGS += -I$(srcdir)/../include -DOPERATION_COUNT=$(OPERATION_COUNT)
 CFLAGS +=
 
 LD_PATHS +=
diff --git a/c/src/tests/tmtests/tm18/Makefile.in b/c/src/tests/tmtests/tm18/Makefile.in
index ba5e34683f..aaaf01b7f9 100644
--- a/c/src/tests/tmtests/tm18/Makefile.in
+++ b/c/src/tests/tmtests/tm18/Makefile.in
@@ -44,8 +44,9 @@ PACKHEX = @PACKHEX@
 # (OPTIONAL) Add local stuff here using +=
 #
 
+OPERATION_COUNT = @OPERATION_COUNT@
 DEFINES +=
-CPPFLAGS += -I$(srcdir)/../include
+CPPFLAGS += -I$(srcdir)/../include -DOPERATION_COUNT=$(OPERATION_COUNT)
 CFLAGS +=
 
 LD_PATHS +=
diff --git a/c/src/tests/tmtests/tm19/Makefile.in b/c/src/tests/tmtests/tm19/Makefile.in
index fbaa2f5820..d9c186841c 100644
--- a/c/src/tests/tmtests/tm19/Makefile.in
+++ b/c/src/tests/tmtests/tm19/Makefile.in
@@ -44,8 +44,9 @@ PACKHEX = @PACKHEX@
 # (OPTIONAL) Add local stuff here using +=
 #
 
+OPERATION_COUNT = @OPERATION_COUNT@
 DEFINES +=
-CPPFLAGS += -I$(srcdir)/../include
+CPPFLAGS += -I$(srcdir)/../include -DOPERATION_COUNT=$(OPERATION_COUNT)
 CFLAGS +=
 
 LD_PATHS +=
diff --git a/c/src/tests/tmtests/tm20/Makefile.in b/c/src/tests/tmtests/tm20/Makefile.in
index 98b35bc665..0bbaf95814 100644
--- a/c/src/tests/tmtests/tm20/Makefile.in
+++ b/c/src/tests/tmtests/tm20/Makefile.in
@@ -44,8 +44,9 @@ PACKHEX = @PACKHEX@
 # (OPTIONAL) Add local stuff here using +=
 #
 
+OPERATION_COUNT = @OPERATION_COUNT@
 DEFINES +=
-CPPFLAGS += -I$(srcdir)/../include
+CPPFLAGS += -I$(srcdir)/../include -DOPERATION_COUNT=$(OPERATION_COUNT)
 CFLAGS +=
 
 LD_PATHS +=
diff --git a/c/src/tests/tmtests/tm21/Makefile.in b/c/src/tests/tmtests/tm21/Makefile.in
index 1b1a353611..c49bfbc155 100644
--- a/c/src/tests/tmtests/tm21/Makefile.in
+++ b/c/src/tests/tmtests/tm21/Makefile.in
@@ -44,8 +44,9 @@ PACKHEX = @PACKHEX@
 # (OPTIONAL) Add local stuff here using +=
 #
 
+OPERATION_COUNT = @OPERATION_COUNT@
 DEFINES +=
-CPPFLAGS += -I$(srcdir)/../include
+CPPFLAGS += -I$(srcdir)/../include -DOPERATION_COUNT=$(OPERATION_COUNT)
 CFLAGS +=
 
 LD_PATHS +=
diff --git a/c/src/tests/tmtests/tm22/Makefile.in b/c/src/tests/tmtests/tm22/Makefile.in
index 14abb7154f..85ff21418a 100644
--- a/c/src/tests/tmtests/tm22/Makefile.in
+++ b/c/src/tests/tmtests/tm22/Makefile.in
@@ -44,8 +44,9 @@ PACKHEX = @PACKHEX@
 # (OPTIONAL) Add local stuff here using +=
 #
 
+OPERATION_COUNT = @OPERATION_COUNT@
 DEFINES +=
-CPPFLAGS += -I$(srcdir)/../include
+CPPFLAGS += -I$(srcdir)/../include -DOPERATION_COUNT=$(OPERATION_COUNT)
 CFLAGS +=
 
 LD_PATHS +=
diff --git a/c/src/tests/tmtests/tm23/Makefile.in b/c/src/tests/tmtests/tm23/Makefile.in
index c8af01b913..a10e3479bb 100644
--- a/c/src/tests/tmtests/tm23/Makefile.in
+++ b/c/src/tests/tmtests/tm23/Makefile.in
@@ -44,8 +44,9 @@ PACKHEX = @PACKHEX@
 # (OPTIONAL) Add local stuff here using +=
 #
 
+OPERATION_COUNT = @OPERATION_COUNT@
 DEFINES +=
-CPPFLAGS += -I$(srcdir)/../include
+CPPFLAGS += -I$(srcdir)/../include -DOPERATION_COUNT=$(OPERATION_COUNT)
 CFLAGS +=
 
 LD_PATHS +=
diff --git a/c/src/tests/tmtests/tm24/Makefile.in b/c/src/tests/tmtests/tm24/Makefile.in
index b6ec1af485..f44b6f0ced 100644
--- a/c/src/tests/tmtests/tm24/Makefile.in
+++ b/c/src/tests/tmtests/tm24/Makefile.in
@@ -44,8 +44,9 @@ PACKHEX = @PACKHEX@
 # (OPTIONAL) Add local stuff here using +=
 #
 
+OPERATION_COUNT = @OPERATION_COUNT@
 DEFINES +=
-CPPFLAGS += -I$(srcdir)/../include
+CPPFLAGS += -I$(srcdir)/../include -DOPERATION_COUNT=$(OPERATION_COUNT)
 CFLAGS +=
 
 LD_PATHS +=
diff --git a/c/src/tests/tmtests/tm25/Makefile.in b/c/src/tests/tmtests/tm25/Makefile.in
index f254d75e7b..23038d07e2 100644
--- a/c/src/tests/tmtests/tm25/Makefile.in
+++ b/c/src/tests/tmtests/tm25/Makefile.in
@@ -44,8 +44,9 @@ PACKHEX = @PACKHEX@
 # (OPTIONAL) Add local stuff here using +=
 #
 
+OPERATION_COUNT = @OPERATION_COUNT@
 DEFINES +=
-CPPFLAGS += -I$(srcdir)/../include
+CPPFLAGS += -I$(srcdir)/../include -DOPERATION_COUNT=$(OPERATION_COUNT)
 CFLAGS +=
 
 LD_PATHS +=
diff --git a/c/src/tests/tmtests/tm26/Makefile.in b/c/src/tests/tmtests/tm26/Makefile.in
index d59c5265e5..ffc106c53c 100644
--- a/c/src/tests/tmtests/tm26/Makefile.in
+++ b/c/src/tests/tmtests/tm26/Makefile.in
@@ -44,8 +44,9 @@ PACKHEX = @PACKHEX@
 # (OPTIONAL) Add local stuff here using +=
 #
 
+OPERATION_COUNT = @OPERATION_COUNT@
 DEFINES +=
-CPPFLAGS += -I$(srcdir)/../include
+CPPFLAGS += -I$(srcdir)/../include -DOPERATION_COUNT=$(OPERATION_COUNT)
 CFLAGS +=
 
 LD_PATHS +=
diff --git a/c/src/tests/tmtests/tm27/Makefile.in b/c/src/tests/tmtests/tm27/Makefile.in
index 05392f7003..7a2c53d7ba 100644
--- a/c/src/tests/tmtests/tm27/Makefile.in
+++ b/c/src/tests/tmtests/tm27/Makefile.in
@@ -44,8 +44,9 @@ PACKHEX = @PACKHEX@
 # (OPTIONAL) Add local stuff here using +=
 #
 
+OPERATION_COUNT = @OPERATION_COUNT@
 DEFINES +=
-CPPFLAGS += -I$(srcdir)/../include
+CPPFLAGS += -I$(srcdir)/../include -DOPERATION_COUNT=$(OPERATION_COUNT)
 
 # since we essentially are building an interrupt handler, must use CFLAGS_OS_V
 
diff --git a/c/src/tests/tmtests/tm28/Makefile.in b/c/src/tests/tmtests/tm28/Makefile.in
index 6e858b22ae..d7179933ba 100644
--- a/c/src/tests/tmtests/tm28/Makefile.in
+++ b/c/src/tests/tmtests/tm28/Makefile.in
@@ -44,8 +44,9 @@ PACKHEX = @PACKHEX@
 # (OPTIONAL) Add local stuff here using +=
 #
 
+OPERATION_COUNT = @OPERATION_COUNT@
 DEFINES +=
-CPPFLAGS += -I$(srcdir)/../include
+CPPFLAGS += -I$(srcdir)/../include -DOPERATION_COUNT=$(OPERATION_COUNT)
 CFLAGS +=
 
 LD_PATHS +=
diff --git a/c/src/tests/tmtests/tm29/Makefile.in b/c/src/tests/tmtests/tm29/Makefile.in
index c0f0f551fd..b0364ae589 100644
--- a/c/src/tests/tmtests/tm29/Makefile.in
+++ b/c/src/tests/tmtests/tm29/Makefile.in
@@ -44,8 +44,9 @@ PACKHEX = @PACKHEX@
 # (OPTIONAL) Add local stuff here using +=
 #
 
+OPERATION_COUNT = @OPERATION_COUNT@
 DEFINES +=
-CPPFLAGS += -I$(srcdir)/../include
+CPPFLAGS += -I$(srcdir)/../include -DOPERATION_COUNT=$(OPERATION_COUNT)
 CFLAGS +=
 
 LD_PATHS +=
diff --git a/c/src/tests/tmtests/tmck/Makefile.in b/c/src/tests/tmtests/tmck/Makefile.in
index 40e7539ff1..80b3b0f8ed 100644
--- a/c/src/tests/tmtests/tmck/Makefile.in
+++ b/c/src/tests/tmtests/tmck/Makefile.in
@@ -44,8 +44,9 @@ PACKHEX = @PACKHEX@
 # (OPTIONAL) Add local stuff here using +=
 #
 
+OPERATION_COUNT = @OPERATION_COUNT@
 DEFINES +=
-CPPFLAGS += -I$(srcdir)/../include
+CPPFLAGS += -I$(srcdir)/../include -DOPERATION_COUNT=$(OPERATION_COUNT)
 CFLAGS +=
 
 LD_PATHS +=
diff --git a/c/src/tests/tmtests/tmoverhd/Makefile.in b/c/src/tests/tmtests/tmoverhd/Makefile.in
index 2e198e95fc..37e2446272 100644
--- a/c/src/tests/tmtests/tmoverhd/Makefile.in
+++ b/c/src/tests/tmtests/tmoverhd/Makefile.in
@@ -44,8 +44,9 @@ PACKHEX = @PACKHEX@
 # (OPTIONAL) Add local stuff here using +=
 #
 
+OPERATION_COUNT = @OPERATION_COUNT@
 DEFINES +=
-CPPFLAGS += -I$(srcdir)/../include
+CPPFLAGS += -I$(srcdir)/../include -DOPERATION_COUNT=$(OPERATION_COUNT)
 CFLAGS +=
 
 LD_PATHS +=
diff --git a/testsuites/tmtests/include/timesys.h b/testsuites/tmtests/include/timesys.h
index 936dd69805..6ba5ea7d17 100644
--- a/testsuites/tmtests/include/timesys.h
+++ b/testsuites/tmtests/include/timesys.h
@@ -21,15 +21,14 @@
  *  blocking tasks to determine the execution time of blocking
  *  services.  By default, the blocking time of 100 tasks will
  *  be measured.  Small targets often do not have enough memory
- *  to create 100 tasks.  By setting the BSP_MAXIMUM_OPERATION_COUNT
- *  to a lower number (typically 10), all of the time tests can be
- *  run.
+ *  to create 100 tasks.  By overriding the default OPERATION_COUNT
+ *  with a lower number (typically 10 or less), all of the time tests
+ *  can usually be run.  This is stil not very fine-grained but
+ *  is enough to significantly reduce memory consumption.
  */
 
-#ifndef BSP_MAXIMUM_OPERATION_COUNT
+#ifndef OPERATION_COUNT
 #define OPERATION_COUNT 100
-#else
-#define OPERATION_COUNT BSP_MAXIMUM_OPERATION_COUNT
 #endif
 
 /*
@@ -41,10 +40,8 @@
  *  not increase memory usage -- only execution time.
  */
 
-#ifndef BSP_ITERATION_COUNT
+#ifndef IT_COUNT
 #define IT_COUNT        100
-#else
-#define IT_COUNT BSP_ITERATION_COUNT
 #endif
 
 /* functions */
-- 
cgit v1.2.3