[PATCH 2/3] testsuite: Make the OPERATION_COUNT a test configuration parameter.

chrisj at rtems.org chrisj at rtems.org
Wed Mar 6 11:20:20 UTC 2019 

From: Chris Johns <chrisj at rtems.org>

- Add a small memory test config file.
- Update the small memory PowerPC BSPs to use the new test config.
---
 .../hurricane/config/hurricane-testsuite.tcfg |   2 +-
 .../rbtx4925/config/rbtx4925-testsuite.tcfg   |   2 +-
 .../rbtx4938/config/rbtx4938-testsuite.tcfg   |   2 +-
 .../moxiesim/config/moxiesim-testsuite.tcfg   |   2 +-
 .../mpc55xxevb/config/gwlcfm-testsuite.tcfg   |   2 +-
 .../config/mpc5566evb-testsuite.tcfg          |   6 +-
 .../config/mpc5566evb_spe-testsuite.tcfg      |   6 +-
 .../config/mpc5643l_dpu-testsuite.tcfg        |  62 +------
 .../config/mpc5643l_evb-testsuite.tcfg        |  62 +------
 .../mpc55xxevb/config/mpc5668g-testsuite.tcfg |   4 +-
 .../config/mpc5674f_ecu508_app-testsuite.tcfg |   5 +-
 .../mpc5674f_ecu508_boot-testsuite.tcfg       |   8 +-
 .../config/mpc5674f_rsm6-testsuite.tcfg       |   8 +-
 .../config/mpc5674fevb-testsuite.tcfg         |   4 +-
 .../config/mpc5674fevb_spe-testsuite.tcfg     |   4 +-
 .../config/phycore_mpc5554-testsuite.tcfg     |   5 +-
 .../qoriq/config/qoriq_core_0-testsuite.tcfg  |   2 +-
 .../qoriq/config/qoriq_core_1-testsuite.tcfg  |   2 +-
 .../qoriq/config/qoriq_e500-testsuite.tcfg    |   2 +-
 .../config/qoriq_e6500_32-testsuite.tcfg      |   2 +-
 .../config/qoriq_e6500_64-testsuite.tcfg      |   2 +-
 testsuites/aclocal/rtems-test-check.m4        |   8 +-
 testsuites/psxtests/psxaio03/init.c           |  25 +--
 testsuites/psxtests/psxaio03/system.h         |  16 +-
 testsuites/psxtmtests/Makefile.am             | 165 ++++++------------
 testsuites/psxtmtests/psxtmbarrier01/init.c   |   4 +
 testsuites/psxtmtests/psxtmbarrier02/init.c   |   8 +-
 testsuites/psxtmtests/psxtmbarrier03/init.c   |   4 +
 testsuites/psxtmtests/psxtmbarrier04/init.c   |   5 +
 .../psxtmtests/psxtmbarrierattr01/init.c      |   4 +
 testsuites/psxtmtests/psxtmcleanup01/init.c   |   4 +
 testsuites/psxtmtests/psxtmcond08/init.c      |   4 +
 testsuites/psxtmtests/psxtmmutex02/init.c     |   6 +-
 testsuites/psxtmtests/psxtmmutex06/init.c     |   6 +-
 testsuites/psxtmtests/psxtmsem03/init.c       |   6 +-
 testsuites/psxtmtests/psxtmthread01/init.c    |   6 +-
 testsuites/sptests/sp71/init.c                |   6 +-
 ...this-bsp.tcfg => disable-libdl-tests.tcfg} |   7 +-
 .../testdata/small-memory-testsuite.tcfg      |  19 ++
 testsuites/tmtests/Makefile.am                |  83 ++++-----
 testsuites/tmtests/configure.ac               |   3 -
 testsuites/tmtests/tm01/task1.c               |   4 +
 testsuites/tmtests/tm02/task1.c               |   4 +
 testsuites/tmtests/tm03/task1.c               |   4 +
 testsuites/tmtests/tm04/task1.c               |   4 +
 testsuites/tmtests/tm06/task1.c               |   4 +
 testsuites/tmtests/tm07/task1.c               |   4 +
 testsuites/tmtests/tm08/task1.c               |   4 +
 testsuites/tmtests/tm09/task1.c               |   4 +
 testsuites/tmtests/tm10/task1.c               |   4 +
 testsuites/tmtests/tm11/task1.c               |   4 +
 testsuites/tmtests/tm12/task1.c               |   4 +
 testsuites/tmtests/tm13/task1.c               |   4 +
 testsuites/tmtests/tm14/task1.c               |   4 +
 testsuites/tmtests/tm15/task1.c               |   4 +
 testsuites/tmtests/tm16/task1.c               |   4 +
 testsuites/tmtests/tm17/task1.c               |   4 +
 testsuites/tmtests/tm18/task1.c               |   4 +
 testsuites/tmtests/tm20/task1.c               |   4 +
 testsuites/tmtests/tm21/task1.c               |   4 +
 testsuites/tmtests/tm22/task1.c               |   4 +
 testsuites/tmtests/tm23/task1.c               |   4 +
 testsuites/tmtests/tm24/task1.c               |   4 +
 testsuites/tmtests/tm25/task1.c               |   4 +
 testsuites/tmtests/tm26/task1.c               |   4 +
 testsuites/tmtests/tm28/task1.c               |   4 +
 testsuites/tmtests/tm29/task1.c               |   4 +
 testsuites/tmtests/tm30/init.c                |  10 +-
 testsuites/tmtests/tmck/task1.c               |   8 +-
 testsuites/tmtests/tmoverhd/testtask.c        |   4 +
 70 files changed, 335 insertions(+), 374 deletions(-)
 rename testsuites/testdata/{dltests-broken-on-this-bsp.tcfg => disable-libdl-tests.tcfg} (75%)
 create mode 100644 testsuites/testdata/small-memory-testsuite.tcfg

diff --git a/bsps/mips/hurricane/config/hurricane-testsuite.tcfg b/bsps/mips/hurricane/config/hurricane-testsuite.tcfg
index fb84b55762..8d039b6993 100644
--- a/bsps/mips/hurricane/config/hurricane-testsuite.tcfg
+++ b/bsps/mips/hurricane/config/hurricane-testsuite.tcfg
@@ -2,4 +2,4 @@
 # This is the set of tests which are known to not link on this BSP
 #
 
-include: testdata/dltests-broken-on-this-bsp.tcfg
+include: testdata/disable-libdl-tests.tcfg
diff --git a/bsps/mips/rbtx4925/config/rbtx4925-testsuite.tcfg b/bsps/mips/rbtx4925/config/rbtx4925-testsuite.tcfg
index fb84b55762..8d039b6993 100644
--- a/bsps/mips/rbtx4925/config/rbtx4925-testsuite.tcfg
+++ b/bsps/mips/rbtx4925/config/rbtx4925-testsuite.tcfg
@@ -2,4 +2,4 @@
 # This is the set of tests which are known to not link on this BSP
 #
 
-include: testdata/dltests-broken-on-this-bsp.tcfg
+include: testdata/disable-libdl-tests.tcfg
diff --git a/bsps/mips/rbtx4938/config/rbtx4938-testsuite.tcfg b/bsps/mips/rbtx4938/config/rbtx4938-testsuite.tcfg
index fb84b55762..8d039b6993 100644
--- a/bsps/mips/rbtx4938/config/rbtx4938-testsuite.tcfg
+++ b/bsps/mips/rbtx4938/config/rbtx4938-testsuite.tcfg
@@ -2,4 +2,4 @@
 # This is the set of tests which are known to not link on this BSP
 #
 
-include: testdata/dltests-broken-on-this-bsp.tcfg
+include: testdata/disable-libdl-tests.tcfg
diff --git a/bsps/moxie/moxiesim/config/moxiesim-testsuite.tcfg b/bsps/moxie/moxiesim/config/moxiesim-testsuite.tcfg
index 056d1c406f..fab8ef049f 100644
--- a/bsps/moxie/moxiesim/config/moxiesim-testsuite.tcfg
+++ b/bsps/moxie/moxiesim/config/moxiesim-testsuite.tcfg
@@ -3,4 +3,4 @@
 #
 
 include: testdata/require-tick-isr.tcfg
-include: testdata/dltests-broken-on-this-bsp.tcfg
+include: testdata/disable-libdl-tests.tcfg
diff --git a/bsps/powerpc/mpc55xxevb/config/gwlcfm-testsuite.tcfg b/bsps/powerpc/mpc55xxevb/config/gwlcfm-testsuite.tcfg
index f8e516bb8e..f64300b5e4 100644
--- a/bsps/powerpc/mpc55xxevb/config/gwlcfm-testsuite.tcfg
+++ b/bsps/powerpc/mpc55xxevb/config/gwlcfm-testsuite.tcfg
@@ -4,7 +4,7 @@
 # Format is one line per test that is _NOT_ built.
 #
 
-include: testdata/dltests-broken-on-this-bsp.tcfg
+include: testdata/disable-libdl-tests.tcfg
 include: testdata/disable-jffs2-tests.tcfg
 
 exclude: fsdosfsname01
diff --git a/bsps/powerpc/mpc55xxevb/config/mpc5566evb-testsuite.tcfg b/bsps/powerpc/mpc55xxevb/config/mpc5566evb-testsuite.tcfg
index cba4641dc3..0b5474d3ea 100644
--- a/bsps/powerpc/mpc55xxevb/config/mpc5566evb-testsuite.tcfg
+++ b/bsps/powerpc/mpc55xxevb/config/mpc5566evb-testsuite.tcfg
@@ -4,8 +4,4 @@
 # Format is one line per test that is _NOT_ built.
 #
 
-include: testdata/dltests-broken-on-this-bsp.tcfg
-include: testdata/disable-jffs2-tests.tcfg
-
-exclude: fsdosfsname01
-exclude: linpack
+include: testdata/small-memory-testsuite.tcfg
diff --git a/bsps/powerpc/mpc55xxevb/config/mpc5566evb_spe-testsuite.tcfg b/bsps/powerpc/mpc55xxevb/config/mpc5566evb_spe-testsuite.tcfg
index 826a183b8e..aa3b464a42 100644
--- a/bsps/powerpc/mpc55xxevb/config/mpc5566evb_spe-testsuite.tcfg
+++ b/bsps/powerpc/mpc55xxevb/config/mpc5566evb_spe-testsuite.tcfg
@@ -4,8 +4,4 @@
 # Format is one line per test that is _NOT_ built.
 #
 
-include: testdata/dltests-broken-on-this-bsp.tcfg
-include: testdata/disable-jffs2-tests.tcfg
-
-exclude: fsdosfsname01
-exclude: linpack
+include: testdata/small-memory-testsuite.tcfg
diff --git a/bsps/powerpc/mpc55xxevb/config/mpc5643l_dpu-testsuite.tcfg b/bsps/powerpc/mpc55xxevb/config/mpc5643l_dpu-testsuite.tcfg
index 32c8c84aee..5261958a88 100644
--- a/bsps/powerpc/mpc55xxevb/config/mpc5643l_dpu-testsuite.tcfg
+++ b/bsps/powerpc/mpc55xxevb/config/mpc5643l_dpu-testsuite.tcfg
@@ -4,64 +4,4 @@
 # Format is one line per test that is _NOT_ built.
 #
 
-include: testdata/dltests-broken-on-this-bsp.tcfg
-include: testdata/disable-jffs2-tests.tcfg
-
-exclude: flashdisk01
-exclude: fsdosfsname01
-exclude: linpack
-exclude: pppd
-exclude: psxaio03
-exclude: psxconfig01
-exclude: psxtmbarrier02
-exclude: psxtmclocknanosleep02
-exclude: psxtmclocknanosleep03
-exclude: psxtmcond08
-exclude: psxtmcond09
-exclude: psxtmcond10
-exclude: psxtmmqrcvblock01
-exclude: psxtmmqrcvblock02
-exclude: psxtmmutex02
-exclude: psxtmmutex04
-exclude: psxtmmutex06
-exclude: psxtmnanosleep02
-exclude: psxtmrwlock02
-exclude: psxtmrwlock03
-exclude: psxtmrwlock04
-exclude: psxtmrwlock05
-exclude: psxtmrwlock07
-exclude: psxtmsem03
-exclude: psxtmsem05
-exclude: psxtmsleep02
-exclude: psxtmthread01
-exclude: psxtmthread03
-exclude: sp47
-exclude: sp71
-exclude: spstkalloc02
-exclude: tm02
-exclude: tm03
-exclude: tm04
-exclude: tm05
-exclude: tm06
-exclude: tm07
-exclude: tm10
-exclude: tm11
-exclude: tm12
-exclude: tm13
-exclude: tm14
-exclude: tm15
-exclude: tm16
-exclude: tm17
-exclude: tm18
-exclude: tm21
-exclude: tm23
-exclude: tm24
-exclude: tm25
-exclude: tm26
-exclude: tm29
-exclude: tm31
-exclude: tm32
-exclude: tm33
-exclude: tm34
-exclude: tm35
-exclude: tm36
+include: testdata/small-memory-testsuite.tcfg
diff --git a/bsps/powerpc/mpc55xxevb/config/mpc5643l_evb-testsuite.tcfg b/bsps/powerpc/mpc55xxevb/config/mpc5643l_evb-testsuite.tcfg
index fe6e37d889..b99267505f 100644
--- a/bsps/powerpc/mpc55xxevb/config/mpc5643l_evb-testsuite.tcfg
+++ b/bsps/powerpc/mpc55xxevb/config/mpc5643l_evb-testsuite.tcfg
@@ -4,64 +4,4 @@
 # Format is one line per test that is _NOT_ built.
 #
 
-include: testdata/dltests-broken-on-this-bsp.tcfg
-include: testdata/disable-jffs2-tests.tcfg
-
-exclude: flashdisk01
-exclude: fsdosfsname01
-exclude: linpack
-exclude: pppd
-exclude: psxaio03
-exclude: psxconfig01
-exclude: psxtmbarrier02
-exclude: psxtmclocknanosleep02
-exclude: psxtmclocknanosleep03
-exclude: psxtmcond08
-exclude: psxtmcond09
-exclude: psxtmcond10
-exclude: psxtmmqrcvblock01
-exclude: psxtmmqrcvblock02
-exclude: psxtmmutex02
-exclude: psxtmmutex04
-exclude: psxtmmutex06
-exclude: psxtmnanosleep02
-exclude: psxtmrwlock02
-exclude: psxtmrwlock03
-exclude: psxtmrwlock04
-exclude: psxtmrwlock05
-exclude: psxtmrwlock07
-exclude: psxtmsem03
-exclude: psxtmsem05
-exclude: psxtmsleep02
-exclude: psxtmthread01
-exclude: psxtmthread03
-exclude: sp47
-exclude: sp71
-exclude: spstkalloc02
-exclude: tm02
-exclude: tm03
-exclude: tm04
-exclude: tm05
-exclude: tm06
-exclude: tm07
-exclude: tm10
-exclude: tm11
-exclude: tm12
-exclude: tm13
-exclude: tm14
-exclude: tm15
-exclude: tm16
-exclude: tm17
-exclude: tm18
-exclude: tm21
-exclude: tm23
-exclude: tm24
-exclude: tm25
-exclude: tm26
-exclude: tm29
-exclude: tm31
-exclude: tm32
-exclude: tm33
-exclude: tm34
-exclude: tm35
-exclude: tm36
+include: testdata/small-memory-testsuite.tcfg
diff --git a/bsps/powerpc/mpc55xxevb/config/mpc5668g-testsuite.tcfg b/bsps/powerpc/mpc55xxevb/config/mpc5668g-testsuite.tcfg
index 6c79cceeac..1d2e02e9d1 100644
--- a/bsps/powerpc/mpc55xxevb/config/mpc5668g-testsuite.tcfg
+++ b/bsps/powerpc/mpc55xxevb/config/mpc5668g-testsuite.tcfg
@@ -2,6 +2,4 @@
 # This is the set of tests which are known to not link on this BSP
 #
 
-include: testdata/dltests-broken-on-this-bsp.tcfg
-
-exclude: linpack
+include: testdata/small-memory-testsuite.tcfg
diff --git a/bsps/powerpc/mpc55xxevb/config/mpc5674f_ecu508_app-testsuite.tcfg b/bsps/powerpc/mpc55xxevb/config/mpc5674f_ecu508_app-testsuite.tcfg
index aa6f47e038..1d2e02e9d1 100644
--- a/bsps/powerpc/mpc55xxevb/config/mpc5674f_ecu508_app-testsuite.tcfg
+++ b/bsps/powerpc/mpc55xxevb/config/mpc5674f_ecu508_app-testsuite.tcfg
@@ -2,7 +2,4 @@
 # This is the set of tests which are known to not link on this BSP
 #
 
-include: testdata/disable-iconv-tests.tcfg
-include: testdata/dltests-broken-on-this-bsp.tcfg
-
-exclude: linpack
+include: testdata/small-memory-testsuite.tcfg
diff --git a/bsps/powerpc/mpc55xxevb/config/mpc5674f_ecu508_boot-testsuite.tcfg b/bsps/powerpc/mpc55xxevb/config/mpc5674f_ecu508_boot-testsuite.tcfg
index f359262339..17aa1967b2 100644
--- a/bsps/powerpc/mpc55xxevb/config/mpc5674f_ecu508_boot-testsuite.tcfg
+++ b/bsps/powerpc/mpc55xxevb/config/mpc5674f_ecu508_boot-testsuite.tcfg
@@ -1,11 +1,5 @@
 #
 # mpc5674f_ecu508_boot RTEMS Test Database.
 #
-# Format is one line per test that is _NOT_ built.
-#
-
-include: testdata/disable-iconv-tests.tcfg
-include: testdata/dltests-broken-on-this-bsp.tcfg
 
-exclude: fsdosfsname01
-exclude: linpack
+include: testdata/small-memory-testsuite.tcfg
diff --git a/bsps/powerpc/mpc55xxevb/config/mpc5674f_rsm6-testsuite.tcfg b/bsps/powerpc/mpc55xxevb/config/mpc5674f_rsm6-testsuite.tcfg
index c417b93df1..bc0cfa7086 100644
--- a/bsps/powerpc/mpc55xxevb/config/mpc5674f_rsm6-testsuite.tcfg
+++ b/bsps/powerpc/mpc55xxevb/config/mpc5674f_rsm6-testsuite.tcfg
@@ -1,11 +1,5 @@
 #
 # mpc5674f_rsm6 RTEMS Test Database.
 #
-# Format is one line per test that is _NOT_ built.
-#
-
-include: testdata/disable-iconv-tests.tcfg
-include: testdata/dltests-broken-on-this-bsp.tcfg
 
-exclude: fsdosfsname01
-exclude: linpack
+include: testdata/small-memory-testsuite.tcfg
diff --git a/bsps/powerpc/mpc55xxevb/config/mpc5674fevb-testsuite.tcfg b/bsps/powerpc/mpc55xxevb/config/mpc5674fevb-testsuite.tcfg
index 6c79cceeac..1d2e02e9d1 100644
--- a/bsps/powerpc/mpc55xxevb/config/mpc5674fevb-testsuite.tcfg
+++ b/bsps/powerpc/mpc55xxevb/config/mpc5674fevb-testsuite.tcfg
@@ -2,6 +2,4 @@
 # This is the set of tests which are known to not link on this BSP
 #
 
-include: testdata/dltests-broken-on-this-bsp.tcfg
-
-exclude: linpack
+include: testdata/small-memory-testsuite.tcfg
diff --git a/bsps/powerpc/mpc55xxevb/config/mpc5674fevb_spe-testsuite.tcfg b/bsps/powerpc/mpc55xxevb/config/mpc5674fevb_spe-testsuite.tcfg
index 6c79cceeac..1d2e02e9d1 100644
--- a/bsps/powerpc/mpc55xxevb/config/mpc5674fevb_spe-testsuite.tcfg
+++ b/bsps/powerpc/mpc55xxevb/config/mpc5674fevb_spe-testsuite.tcfg
@@ -2,6 +2,4 @@
 # This is the set of tests which are known to not link on this BSP
 #
 
-include: testdata/dltests-broken-on-this-bsp.tcfg
-
-exclude: linpack
+include: testdata/small-memory-testsuite.tcfg
diff --git a/bsps/powerpc/mpc55xxevb/config/phycore_mpc5554-testsuite.tcfg b/bsps/powerpc/mpc55xxevb/config/phycore_mpc5554-testsuite.tcfg
index 3ca7f48c46..72f987b240 100644
--- a/bsps/powerpc/mpc55xxevb/config/phycore_mpc5554-testsuite.tcfg
+++ b/bsps/powerpc/mpc55xxevb/config/phycore_mpc5554-testsuite.tcfg
@@ -4,7 +4,4 @@
 # Format is one line per test that is _NOT_ built.
 #
 
-include: testdata/dltests-broken-on-this-bsp.tcfg
-include: testdata/disable-jffs2-tests.tcfg
-
-exclude: fsdosfsname01
+include: testdata/small-memory-testsuite.tcfg
diff --git a/bsps/powerpc/qoriq/config/qoriq_core_0-testsuite.tcfg b/bsps/powerpc/qoriq/config/qoriq_core_0-testsuite.tcfg
index fb84b55762..8d039b6993 100644
--- a/bsps/powerpc/qoriq/config/qoriq_core_0-testsuite.tcfg
+++ b/bsps/powerpc/qoriq/config/qoriq_core_0-testsuite.tcfg
@@ -2,4 +2,4 @@
 # This is the set of tests which are known to not link on this BSP
 #
 
-include: testdata/dltests-broken-on-this-bsp.tcfg
+include: testdata/disable-libdl-tests.tcfg
diff --git a/bsps/powerpc/qoriq/config/qoriq_core_1-testsuite.tcfg b/bsps/powerpc/qoriq/config/qoriq_core_1-testsuite.tcfg
index fb84b55762..8d039b6993 100644
--- a/bsps/powerpc/qoriq/config/qoriq_core_1-testsuite.tcfg
+++ b/bsps/powerpc/qoriq/config/qoriq_core_1-testsuite.tcfg
@@ -2,4 +2,4 @@
 # This is the set of tests which are known to not link on this BSP
 #
 
-include: testdata/dltests-broken-on-this-bsp.tcfg
+include: testdata/disable-libdl-tests.tcfg
diff --git a/bsps/powerpc/qoriq/config/qoriq_e500-testsuite.tcfg b/bsps/powerpc/qoriq/config/qoriq_e500-testsuite.tcfg
index fb84b55762..8d039b6993 100644
--- a/bsps/powerpc/qoriq/config/qoriq_e500-testsuite.tcfg
+++ b/bsps/powerpc/qoriq/config/qoriq_e500-testsuite.tcfg
@@ -2,4 +2,4 @@
 # This is the set of tests which are known to not link on this BSP
 #
 
-include: testdata/dltests-broken-on-this-bsp.tcfg
+include: testdata/disable-libdl-tests.tcfg
diff --git a/bsps/powerpc/qoriq/config/qoriq_e6500_32-testsuite.tcfg b/bsps/powerpc/qoriq/config/qoriq_e6500_32-testsuite.tcfg
index fb84b55762..8d039b6993 100644
--- a/bsps/powerpc/qoriq/config/qoriq_e6500_32-testsuite.tcfg
+++ b/bsps/powerpc/qoriq/config/qoriq_e6500_32-testsuite.tcfg
@@ -2,4 +2,4 @@
 # This is the set of tests which are known to not link on this BSP
 #
 
-include: testdata/dltests-broken-on-this-bsp.tcfg
+include: testdata/disable-libdl-tests.tcfg
diff --git a/bsps/powerpc/qoriq/config/qoriq_e6500_64-testsuite.tcfg b/bsps/powerpc/qoriq/config/qoriq_e6500_64-testsuite.tcfg
index fb84b55762..8d039b6993 100644
--- a/bsps/powerpc/qoriq/config/qoriq_e6500_64-testsuite.tcfg
+++ b/bsps/powerpc/qoriq/config/qoriq_e6500_64-testsuite.tcfg
@@ -2,4 +2,4 @@
 # This is the set of tests which are known to not link on this BSP
 #
 
-include: testdata/dltests-broken-on-this-bsp.tcfg
+include: testdata/disable-libdl-tests.tcfg
diff --git a/testsuites/aclocal/rtems-test-check.m4 b/testsuites/aclocal/rtems-test-check.m4
index 36a917b3e8..a0feee5e15 100644
--- a/testsuites/aclocal/rtems-test-check.m4
+++ b/testsuites/aclocal/rtems-test-check.m4
@@ -15,17 +15,17 @@ AC_DEFUN([RTEMS_TEST_CHECK],
  fi
  if test "$1" = "$check_result"; then
   if test -f $tcheck; then
-   test_FLAGS=`$tcheck flags ${RTEMS_BSP} $tdata $tincludes $1`
+   test_CFLAGS=`$tcheck cflags ${RTEMS_BSP} $tdata $tincludes $1`
   fi
-  if test -z "$test_FLAGS"; then
+  if test -z "$test_CFLAGS"; then
    result_msg="PASS"
   else
-   result_msg="$test_FLAGS"
+   result_msg="$test_CFLAGS"
   fi
  else
    result_msg="EXCLUDED"
  fi
  AC_MSG_RESULT([$result_msg])
  AM_CONDITIONAL([TEST_$1], [test "$result_msg" != "EXCLUDED"])
- AC_SUBST([TEST_FLAGS_$1], [$test_FLAGS])
+ AC_SUBST([TEST_FLAGS_$1], [$test_CFLAGS])
 ])
diff --git a/testsuites/psxtests/psxaio03/init.c b/testsuites/psxtests/psxaio03/init.c
index d8a13fa8e4..0893696962 100644
--- a/testsuites/psxtests/psxaio03/init.c
+++ b/testsuites/psxtests/psxaio03/init.c
@@ -7,6 +7,10 @@
  *
  */
 
+#if !defined(OPERATION_COUNT)
+#define OPERATION_COUNT 100
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -86,12 +90,12 @@ POSIX_Init (void *argument)
       fd[i] = open (filename, O_RDWR|O_CREAT, S_IRWXU|S_IRWXG|S_IRWXO);
       rtems_test_assert ( fd[i] != -1);
     }
-  
+
   puts (" Init: [WQ] aio_write on 1st file ");
   aiocbp[0] = create_aiocb (fd[0]);
   status = aio_write (aiocbp[0]);
   rtems_test_assert (status != -1);
-  
+
   puts (" Init: [WQ] aio_write on 2nd file ");
   aiocbp[1] = create_aiocb (fd[1]);
   status = aio_write (aiocbp[1]);
@@ -101,17 +105,17 @@ POSIX_Init (void *argument)
   aiocbp[2] = create_aiocb (fd[1]);
   status = aio_read (aiocbp[2]);
   rtems_test_assert (status != -1);
-  
+
   puts (" Init: [WQ] aio_write on 3rd file ");
   aiocbp[3] = create_aiocb (fd[2]);
   status = aio_write (aiocbp[3]);
   rtems_test_assert (status != -1);
-  
+
   puts (" Init: [WQ] aio_write on 4th file ");
   aiocbp[4] = create_aiocb (fd[3]);
   status = aio_write (aiocbp[4]);
   rtems_test_assert (status != -1);
- 
+
   puts (" Init: [WQ] aio_write on 5th file  -- [WQ] full ");
   aiocbp[5] = create_aiocb (fd[4]);
   status = aio_write (aiocbp[5]);
@@ -121,16 +125,16 @@ POSIX_Init (void *argument)
   aiocbp[6] = create_aiocb (fd[5]);
   status = aio_read (aiocbp[6]);
   rtems_test_assert (status != -1);
- 
+
   puts (" Init: going to sleep for 5 sec ");
   sleep (5);
   puts (" Init: going to sleep again for 5 sec ");
   sleep (5);
   puts (" Init: going to sleep again for 5 sec ");
   sleep (5);
-  
+
   TEST_END();
-  
+
   for (i = 0; i < FD_COUNT; i++)
     {
       close (fd[i]);
@@ -138,8 +142,7 @@ POSIX_Init (void *argument)
     }
   free_aiocb (aiocbp[i]);
   rtems_test_exit (0);
-  
+
   return NULL;
-  
-}
 
+}
diff --git a/testsuites/psxtests/psxaio03/system.h b/testsuites/psxtests/psxaio03/system.h
index 1ba17d2d8a..236ef19a91 100644
--- a/testsuites/psxtests/psxaio03/system.h
+++ b/testsuites/psxtests/psxaio03/system.h
@@ -21,19 +21,19 @@ void *POSIX_Init (void *argument);
 #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
-#define CONFIGURE_MAXIMUM_TASKS             20
-#define CONFIGURE_MAXIMUM_SEMAPHORES        20
-#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES    20
-#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 20
+#define CONFIGURE_MAXIMUM_TASKS             10
+#define CONFIGURE_MAXIMUM_SEMAPHORES        10
+#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES    10
+#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 10
 
 #define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
 
-#define CONFIGURE_MAXIMUM_POSIX_THREADS        30
-#define CONFIGURE_MAXIMUM_POSIX_KEYS           30
+#define CONFIGURE_MAXIMUM_POSIX_THREADS        10
+#define CONFIGURE_MAXIMUM_POSIX_KEYS           10
 
 #define CONFIGURE_POSIX_INIT_THREAD_TABLE
-#define CONFIGURE_EXTRA_TASK_STACKS         (10 * RTEMS_MINIMUM_STACK_SIZE)
-#define CONFIGURE_POSIX_INIT_THREAD_STACK_SIZE (10 * RTEMS_MINIMUM_STACK_SIZE)
+#define CONFIGURE_EXTRA_TASK_STACKS            (5 * RTEMS_MINIMUM_STACK_SIZE)
+#define CONFIGURE_POSIX_INIT_THREAD_STACK_SIZE (5 * RTEMS_MINIMUM_STACK_SIZE)
 
 #define CONFIGURE_MALLOC_STATISTICS
 
diff --git a/testsuites/psxtmtests/Makefile.am b/testsuites/psxtmtests/Makefile.am
index 1f22850ebf..88ee7f2495 100644
--- a/testsuites/psxtmtests/Makefile.am
+++ b/testsuites/psxtmtests/Makefile.am
@@ -20,8 +20,7 @@ psxtmbarrier01_SOURCES = psxtmbarrier01/init.c \
 	../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \
 	../support/src/tmtests_support.c
 psxtmbarrier01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmbarrier01) \
-	$(support_includes) -I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	$(support_includes) -I$(top_srcdir)/../tmtests/include
 endif
 
 if TEST_psxtmbarrier02
@@ -31,8 +30,7 @@ psxtmbarrier02_SOURCES = psxtmbarrier02/init.c \
 	../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \
 	../support/src/tmtests_support.c
 psxtmbarrier02_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmbarrier02) \
-	$(support_includes) -I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	$(support_includes) -I$(top_srcdir)/../tmtests/include
 endif
 
 if TEST_psxtmbarrier03
@@ -42,8 +40,7 @@ psxtmbarrier03_SOURCES = psxtmbarrier03/init.c \
 	../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \
 	../support/src/tmtests_support.c
 psxtmbarrier03_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmbarrier03) \
-	$(support_includes) -I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	$(support_includes) -I$(top_srcdir)/../tmtests/include
 endif
 
 if TEST_psxtmbarrier04
@@ -53,8 +50,7 @@ psxtmbarrier04_SOURCES = psxtmbarrier04/init.c \
 	../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \
 	../support/src/tmtests_support.c
 psxtmbarrier04_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmbarrier04) \
-	$(support_includes) -I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	$(support_includes) -I$(top_srcdir)/../tmtests/include
 endif
 
 if TEST_psxtmbarrierattr01
@@ -64,8 +60,7 @@ psxtmbarrierattr01_SOURCES = psxtmbarrierattr01/init.c \
 	../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \
 	../support/src/tmtests_support.c
 psxtmbarrierattr01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmbarrierattr01) \
-	$(support_includes) -I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	$(support_includes) -I$(top_srcdir)/../tmtests/include
 endif
 
 if TEST_psxtmcleanup01
@@ -76,8 +71,7 @@ psxtmcleanup01_SOURCES = psxtmcleanup01/init.c \
 	../support/src/tmtests_support.c
 psxtmcleanup01_CPPFLAGS = $(AM_CPPFLAGS) \
 	$(TEST_FLAGS_psxtmcleanup01) $(support_includes) \
-	-I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	-I$(top_srcdir)/../tmtests/include
 endif
 
 if TEST_psxtmclocknanosleep01
@@ -88,8 +82,7 @@ psxtmclocknanosleep01_SOURCES = psxtmclocknanosleep01/init.c \
 	../support/src/tmtests_support.c
 psxtmclocknanosleep01_CPPFLAGS = $(AM_CPPFLAGS) \
 	$(TEST_FLAGS_psxtmclocknanosleep01) $(support_includes) \
-	-I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	-I$(top_srcdir)/../tmtests/include
 endif
 
 if TEST_psxtmclocknanosleep02
@@ -100,8 +93,7 @@ psxtmclocknanosleep02_SOURCES = psxtmclocknanosleep02/init.c \
 	../support/src/tmtests_support.c
 psxtmclocknanosleep02_CPPFLAGS = $(AM_CPPFLAGS) \
 	$(TEST_FLAGS_psxtmclocknanosleep02) $(support_includes) \
-	-I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	-I$(top_srcdir)/../tmtests/include
 endif
 
 if TEST_psxtmclocknanosleep03
@@ -112,8 +104,7 @@ psxtmclocknanosleep03_SOURCES = psxtmclocknanosleep03/init.c \
 	../support/src/tmtests_support.c
 psxtmclocknanosleep03_CPPFLAGS = $(AM_CPPFLAGS) \
 	$(TEST_FLAGS_psxtmclocknanosleep03) $(support_includes) \
-	-I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	-I$(top_srcdir)/../tmtests/include
 endif
 
 if TEST_psxtmcond01
@@ -123,8 +114,7 @@ psxtmcond01_SOURCES = psxtmcond01/init.c ../tmtests/include/timesys.h \
 	../support/src/tmtests_empty_function.c \
 	../support/src/tmtests_support.c
 psxtmcond01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmcond01) \
-	$(support_includes) -I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	$(support_includes) -I$(top_srcdir)/../tmtests/include
 endif
 
 if TEST_psxtmcond02
@@ -134,8 +124,7 @@ psxtmcond02_SOURCES = psxtmcond02/init.c ../tmtests/include/timesys.h \
 	../support/src/tmtests_empty_function.c \
 	../support/src/tmtests_support.c
 psxtmcond02_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmcond02) \
-	$(support_includes) -I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	$(support_includes) -I$(top_srcdir)/../tmtests/include
 endif
 
 if TEST_psxtmcond03
@@ -145,8 +134,7 @@ psxtmcond03_SOURCES = psxtmcond03/init.c ../tmtests/include/timesys.h \
 	../support/src/tmtests_empty_function.c \
 	../support/src/tmtests_support.c
 psxtmcond03_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmcond03) \
-	$(support_includes) -I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	$(support_includes) -I$(top_srcdir)/../tmtests/include
 endif
 
 if TEST_psxtmcond04
@@ -156,8 +144,7 @@ psxtmcond04_SOURCES = psxtmcond04/init.c ../tmtests/include/timesys.h \
 	../support/src/tmtests_empty_function.c \
 	../support/src/tmtests_support.c
 psxtmcond04_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmcond04) \
-	$(support_includes) -I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	$(support_includes) -I$(top_srcdir)/../tmtests/include
 endif
 
 if TEST_psxtmcond05
@@ -167,8 +154,7 @@ psxtmcond05_SOURCES = psxtmcond05/init.c ../tmtests/include/timesys.h \
 	../support/src/tmtests_empty_function.c \
 	../support/src/tmtests_support.c
 psxtmcond05_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmcond05) \
-	$(support_includes) -I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	$(support_includes) -I$(top_srcdir)/../tmtests/include
 endif
 
 if TEST_psxtmcond06
@@ -178,8 +164,7 @@ psxtmcond06_SOURCES = psxtmcond06/init.c ../tmtests/include/timesys.h \
 	../support/src/tmtests_empty_function.c \
 	../support/src/tmtests_support.c
 psxtmcond06_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmcond06) \
-	$(support_includes) -I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	$(support_includes) -I$(top_srcdir)/../tmtests/include
 endif
 
 if TEST_psxtmcond07
@@ -189,8 +174,7 @@ psxtmcond07_SOURCES = psxtmcond07/init.c ../tmtests/include/timesys.h \
 	../support/src/tmtests_empty_function.c \
 	../support/src/tmtests_support.c
 psxtmcond07_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmcond07) \
-	$(support_includes) -I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	$(support_includes) -I$(top_srcdir)/../tmtests/include
 endif
 
 if TEST_psxtmcond08
@@ -200,8 +184,7 @@ psxtmcond08_SOURCES = psxtmcond08/init.c ../tmtests/include/timesys.h \
 	../support/src/tmtests_empty_function.c \
 	../support/src/tmtests_support.c
 psxtmcond08_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmcond08) \
-	$(support_includes) -I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT) -DUSE_WAIT
+	$(support_includes) -I$(top_srcdir)/../tmtests/include -DUSE_WAIT
 endif
 
 if TEST_psxtmcond09
@@ -212,7 +195,7 @@ psxtmcond09_SOURCES = psxtmcond08/init.c ../tmtests/include/timesys.h \
 	../support/src/tmtests_support.c
 psxtmcond09_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmcond09) \
 	$(support_includes) -I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT) -DUSE_TIMEDWAIT_WITH_VALUE
+	-DUSE_TIMEDWAIT_WITH_VALUE
 endif
 
 if TEST_psxtmcond10
@@ -223,7 +206,6 @@ psxtmcond10_SOURCES = psxtmcond08/init.c ../tmtests/include/timesys.h \
 	../support/src/tmtests_support.c
 psxtmcond10_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmcond10) \
 	$(support_includes) -I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT) \
 	-DUSE_TIMEDWAIT_WAIT_VALUE_IN_PAST
 endif
 
@@ -234,8 +216,7 @@ psxtmkey01_SOURCES = psxtmkey01/init.c ../tmtests/include/timesys.h \
 	../support/src/tmtests_empty_function.c \
 	../support/src/tmtests_support.c
 psxtmkey01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmkey01) \
-	$(support_includes) -I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	$(support_includes) -I$(top_srcdir)/../tmtests/include
 endif
 
 if TEST_psxtmkey02
@@ -245,8 +226,7 @@ psxtmkey02_SOURCES = psxtmkey02/init.c ../tmtests/include/timesys.h \
 	../support/src/tmtests_empty_function.c \
 	../support/src/tmtests_support.c
 psxtmkey02_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmkey02) \
-	$(support_includes) -I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	$(support_includes) -I$(top_srcdir)/../tmtests/include
 endif
 
 if TEST_psxtmmq01
@@ -256,8 +236,7 @@ psxtmmq01_SOURCES = psxtmmq01/init.c ../tmtests/include/timesys.h \
 	../support/src/tmtests_empty_function.c \
 	../support/src/tmtests_support.c
 psxtmmq01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmmq01) \
-	$(support_includes) -I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	$(support_includes) -I$(top_srcdir)/../tmtests/include
 endif
 
 if TEST_psxtmmutex01
@@ -267,8 +246,7 @@ psxtmmutex01_SOURCES = psxtmmutex01/init.c \
 	../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \
 	../support/src/tmtests_support.c
 psxtmmutex01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmmutex01) \
-	$(support_includes) -I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	$(support_includes) -I$(top_srcdir)/../tmtests/include
 endif
 
 if TEST_psxtmmutex02
@@ -278,8 +256,7 @@ psxtmmutex02_SOURCES = psxtmmutex02/init.c \
 	../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \
 	../support/src/tmtests_support.c
 psxtmmutex02_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmmutex02) \
-	$(support_includes) -I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	$(support_includes) -I$(top_srcdir)/../tmtests/include
 endif
 
 if TEST_psxtmmutex03
@@ -289,8 +266,7 @@ psxtmmutex03_SOURCES = psxtmmutex03/init.c \
 	../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \
 	../support/src/tmtests_support.c
 psxtmmutex03_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmmutex03) \
-	$(support_includes) -I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	$(support_includes) -I$(top_srcdir)/../tmtests/include
 endif
 
 if TEST_psxtmmutex04
@@ -300,8 +276,7 @@ psxtmmutex04_SOURCES = psxtmmutex04/init.c \
 	../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \
 	../support/src/tmtests_support.c
 psxtmmutex04_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmmutex04) \
-	$(support_includes) -I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	$(support_includes) -I$(top_srcdir)/../tmtests/include
 endif
 
 if TEST_psxtmmutex05
@@ -311,8 +286,7 @@ psxtmmutex05_SOURCES = psxtmmutex05/init.c \
 	../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \
 	../support/src/tmtests_support.c
 psxtmmutex05_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmmutex05) \
-	$(support_includes) -I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	$(support_includes) -I$(top_srcdir)/../tmtests/include
 endif
 
 if TEST_psxtmmutex06
@@ -322,8 +296,7 @@ psxtmmutex06_SOURCES = psxtmmutex06/init.c \
 	../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \
 	../support/src/tmtests_support.c
 psxtmmutex06_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmmutex06) \
-	$(support_includes) -I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	$(support_includes) -I$(top_srcdir)/../tmtests/include
 endif
 
 if TEST_psxtmmutex07
@@ -333,8 +306,7 @@ psxtmmutex07_SOURCES = psxtmmutex07/init.c \
 	../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \
 	../support/src/tmtests_support.c
 psxtmmutex07_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmmutex07) \
-	$(support_includes) -I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	$(support_includes) -I$(top_srcdir)/../tmtests/include
 endif
 
 if TEST_psxtmmutexattr01
@@ -344,8 +316,7 @@ psxtmmutexattr01_SOURCES = psxtmmutexattr01/init.c \
 	../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \
 	../support/src/tmtests_support.c
 psxtmmutexattr01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmmutexattr01) \
-	$(support_includes) -I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	$(support_includes) -I$(top_srcdir)/../tmtests/include
 endif
 
 if TEST_psxtmnanosleep01
@@ -356,8 +327,7 @@ psxtmnanosleep01_SOURCES = psxtmnanosleep01/init.c \
 	../support/src/tmtests_support.c
 psxtmnanosleep01_CPPFLAGS = $(AM_CPPFLAGS) \
 	$(TEST_FLAGS_psxtmnanosleep01) $(support_includes) \
-	-I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	-I$(top_srcdir)/../tmtests/include
 endif
 
 if TEST_psxtmnanosleep02
@@ -368,8 +338,7 @@ psxtmnanosleep02_SOURCES = psxtmnanosleep02/init.c \
 	../support/src/tmtests_support.c
 psxtmnanosleep02_CPPFLAGS = $(AM_CPPFLAGS) \
 	$(TEST_FLAGS_psxtmnanosleep02) $(support_includes) \
-	-I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	-I$(top_srcdir)/../tmtests/include
 endif
 
 if TEST_psxtmonce01
@@ -379,8 +348,7 @@ psxtmonce01_SOURCES = psxtmonce01/init.c \
 	../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \
 	../support/src/tmtests_support.c
 psxtmonce01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmonce01) \
-	$(support_includes) -I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	$(support_includes) -I$(top_srcdir)/../tmtests/include
 endif
 
 if TEST_psxtmrwlock01
@@ -390,8 +358,7 @@ psxtmrwlock01_SOURCES = psxtmrwlock01/init.c \
 	../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \
 	../support/src/tmtests_support.c
 psxtmrwlock01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmrwlock01) \
-	$(support_includes) -I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	$(support_includes) -I$(top_srcdir)/../tmtests/include
 endif
 
 if TEST_psxtmrwlock02
@@ -401,8 +368,7 @@ psxtmrwlock02_SOURCES = psxtmrwlock02/init.c \
 	../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \
 	../support/src/tmtests_support.c
 psxtmrwlock02_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmrwlock02) \
-	$(support_includes) -I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	$(support_includes) -I$(top_srcdir)/../tmtests/include
 endif
 
 if TEST_psxtmrwlock03
@@ -412,8 +378,7 @@ psxtmrwlock03_SOURCES = psxtmrwlock03/init.c \
 	../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \
 	../support/src/tmtests_support.c
 psxtmrwlock03_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmrwlock03) \
-	$(support_includes) -I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	$(support_includes) -I$(top_srcdir)/../tmtests/include
 endif
 
 if TEST_psxtmrwlock04
@@ -423,8 +388,7 @@ psxtmrwlock04_SOURCES = psxtmrwlock04/init.c \
 	../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \
 	../support/src/tmtests_support.c
 psxtmrwlock04_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmrwlock04) \
-	$(support_includes) -I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	$(support_includes) -I$(top_srcdir)/../tmtests/include
 endif
 
 if TEST_psxtmrwlock05
@@ -434,8 +398,7 @@ psxtmrwlock05_SOURCES = psxtmrwlock05/init.c \
 	../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \
 	../support/src/tmtests_support.c
 psxtmrwlock05_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmrwlock05) \
-	$(support_includes) -I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	$(support_includes) -I$(top_srcdir)/../tmtests/include
 endif
 
 if TEST_psxtmrwlock06
@@ -445,8 +408,7 @@ psxtmrwlock06_SOURCES = psxtmrwlock06/init.c \
 	../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \
 	../support/src/tmtests_support.c
 psxtmrwlock06_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmrwlock06) \
-	$(support_includes) -I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	$(support_includes) -I$(top_srcdir)/../tmtests/include
 endif
 
 if TEST_psxtmrwlock07
@@ -456,8 +418,7 @@ psxtmrwlock07_SOURCES = psxtmrwlock07/init.c \
 	../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \
 	../support/src/tmtests_support.c
 psxtmrwlock07_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmrwlock07) \
-	$(support_includes) -I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	$(support_includes) -I$(top_srcdir)/../tmtests/include
 endif
 
 if TEST_psxtmmqrcvblock01
@@ -467,8 +428,7 @@ psxtmmqrcvblock01_SOURCES = psxtmmqrcvblock01/init.c \
 	../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \
 	../support/src/tmtests_support.c
 psxtmmqrcvblock01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmmqrcvblock01) \
-	$(support_includes) -I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	$(support_includes) -I$(top_srcdir)/../tmtests/include
 endif
 
 if TEST_psxtmmqrcvblock02
@@ -478,8 +438,7 @@ psxtmmqrcvblock02_SOURCES = psxtmmqrcvblock02/init.c \
 	../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \
 	../support/src/tmtests_support.c
 psxtmmqrcvblock02_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmmqrcvblock02) \
-	$(support_includes) -I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	$(support_includes) -I$(top_srcdir)/../tmtests/include
 endif
 
 if TEST_psxtmsem01
@@ -489,8 +448,7 @@ psxtmsem01_SOURCES = psxtmsem01/init.c ../tmtests/include/timesys.h \
 	../support/src/tmtests_empty_function.c \
 	../support/src/tmtests_support.c
 psxtmsem01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmsem01) \
-	$(support_includes) -I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	$(support_includes) -I$(top_srcdir)/../tmtests/include
 endif
 
 if TEST_psxtmsem02
@@ -500,8 +458,7 @@ psxtmsem02_SOURCES = psxtmsem02/init.c ../tmtests/include/timesys.h \
 	../support/src/tmtests_empty_function.c \
 	../support/src/tmtests_support.c
 psxtmsem02_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmsem02) \
-	$(support_includes) -I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	$(support_includes) -I$(top_srcdir)/../tmtests/include
 endif
 
 if TEST_psxtmsem03
@@ -511,8 +468,7 @@ psxtmsem03_SOURCES = psxtmsem03/init.c ../tmtests/include/timesys.h \
 	../support/src/tmtests_empty_function.c \
 	../support/src/tmtests_support.c
 psxtmsem03_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmsem03) \
-	$(support_includes) -I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	$(support_includes) -I$(top_srcdir)/../tmtests/include
 endif
 
 if TEST_psxtmsem04
@@ -522,8 +478,7 @@ psxtmsem04_SOURCES = psxtmsem04/init.c ../tmtests/include/timesys.h \
 	../support/src/tmtests_empty_function.c \
 	../support/src/tmtests_support.c
 psxtmsem04_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmsem04) \
-	$(support_includes) -I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	$(support_includes) -I$(top_srcdir)/../tmtests/include
 endif
 
 if TEST_psxtmsem05
@@ -533,8 +488,7 @@ psxtmsem05_SOURCES = psxtmsem05/init.c ../tmtests/include/timesys.h \
 	../support/src/tmtests_empty_function.c \
 	../support/src/tmtests_support.c
 psxtmsem05_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmsem05) \
-	$(support_includes) -I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	$(support_includes) -I$(top_srcdir)/../tmtests/include
 endif
 
 if TEST_psxtmsleep01
@@ -544,8 +498,7 @@ psxtmsleep01_SOURCES = psxtmsleep01/init.c \
 	../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \
 	../support/src/tmtests_support.c
 psxtmsleep01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmsleep01) \
-	$(support_includes) -I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	$(support_includes) -I$(top_srcdir)/../tmtests/include
 endif
 
 if TEST_psxtmsleep02
@@ -555,8 +508,7 @@ psxtmsleep02_SOURCES = psxtmsleep02/init.c \
 	../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \
 	../support/src/tmtests_support.c
 psxtmsleep02_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmsleep02) \
-	$(support_includes) -I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	$(support_includes) -I$(top_srcdir)/../tmtests/include
 endif
 
 if TEST_psxtmthread01
@@ -566,8 +518,7 @@ psxtmthread01_SOURCES = psxtmthread01/init.c \
 	../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \
 	../support/src/tmtests_support.c
 psxtmthread01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmthread01) \
-	$(support_includes) -I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	$(support_includes) -I$(top_srcdir)/../tmtests/include
 endif
 
 if TEST_psxtmthread02
@@ -577,8 +528,7 @@ psxtmthread02_SOURCES = psxtmthread02/init.c \
 	../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \
 	../support/src/tmtests_support.c
 psxtmthread02_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmthread02) \
-	$(support_includes) -I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	$(support_includes) -I$(top_srcdir)/../tmtests/include
 endif
 
 if TEST_psxtmthread03
@@ -588,8 +538,7 @@ psxtmthread03_SOURCES = psxtmthread03/init.c \
 	../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \
 	../support/src/tmtests_support.c
 psxtmthread03_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmthread03) \
-	$(support_includes) -I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	$(support_includes) -I$(top_srcdir)/../tmtests/include
 endif
 
 if TEST_psxtmthread04
@@ -599,8 +548,7 @@ psxtmthread04_SOURCES = psxtmthread04/init.c \
 	../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \
 	../support/src/tmtests_support.c
 psxtmthread04_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmthread04) \
-	$(support_includes) -I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	$(support_includes) -I$(top_srcdir)/../tmtests/include
 endif
 
 if TEST_psxtmthread05
@@ -610,8 +558,7 @@ psxtmthread05_SOURCES = psxtmthread05/init.c \
 	../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \
 	../support/src/tmtests_support.c
 psxtmthread05_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmthread05) \
-	$(support_includes) -I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	$(support_includes) -I$(top_srcdir)/../tmtests/include
 endif
 
 if TEST_psxtmthread06
@@ -621,8 +568,7 @@ psxtmthread06_SOURCES = psxtmthread06/init.c \
 	../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \
 	../support/src/tmtests_support.c
 psxtmthread06_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmthread06) \
-	$(support_includes) -I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	$(support_includes) -I$(top_srcdir)/../tmtests/include
 endif
 
 if TEST_psxtmthreadattr01
@@ -632,8 +578,7 @@ psxtmthreadattr01_SOURCES = psxtmthreadattr01/init.c \
 	../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \
 	../support/src/tmtests_support.c
 psxtmthreadattr01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmthreadattr01) \
-	$(support_includes) -I$(top_srcdir)/../tmtests/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	$(support_includes) -I$(top_srcdir)/../tmtests/include
 endif
 
 noinst_PROGRAMS = $(psxtm_tests)
diff --git a/testsuites/psxtmtests/psxtmbarrier01/init.c b/testsuites/psxtmtests/psxtmbarrier01/init.c
index 06d61e3c98..4c9697a8a3 100644
--- a/testsuites/psxtmtests/psxtmbarrier01/init.c
+++ b/testsuites/psxtmtests/psxtmbarrier01/init.c
@@ -7,6 +7,10 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
+#if !defined(OPERATION_COUNT)
+#define OPERATION_COUNT 100
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/testsuites/psxtmtests/psxtmbarrier02/init.c b/testsuites/psxtmtests/psxtmbarrier02/init.c
index 22e9a56278..47b5a964e6 100644
--- a/testsuites/psxtmtests/psxtmbarrier02/init.c
+++ b/testsuites/psxtmtests/psxtmbarrier02/init.c
@@ -7,6 +7,10 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
+#if !defined(OPERATION_COUNT)
+#define OPERATION_COUNT 100
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -71,7 +75,7 @@ void *Middle(
     /* let other threads run */
 
     (void) pthread_barrier_wait( &barrier );
-  
+
   /* should never return */
   rtems_test_assert( FALSE );
   return NULL;
@@ -92,7 +96,7 @@ void *POSIX_Init(
     status = pthread_create( &threadId, NULL, Middle, NULL );
     rtems_test_assert( !status );
   }
-  
+
   status = pthread_create( &threadId, NULL, Low, NULL );
   rtems_test_assert( !status );
 
diff --git a/testsuites/psxtmtests/psxtmbarrier03/init.c b/testsuites/psxtmtests/psxtmbarrier03/init.c
index c0334e2b53..49c3ed893d 100644
--- a/testsuites/psxtmtests/psxtmbarrier03/init.c
+++ b/testsuites/psxtmtests/psxtmbarrier03/init.c
@@ -7,6 +7,10 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
+#if !defined(OPERATION_COUNT)
+#define OPERATION_COUNT 100
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/testsuites/psxtmtests/psxtmbarrier04/init.c b/testsuites/psxtmtests/psxtmbarrier04/init.c
index 5d4885c193..a463d9a8d2 100644
--- a/testsuites/psxtmtests/psxtmbarrier04/init.c
+++ b/testsuites/psxtmtests/psxtmbarrier04/init.c
@@ -7,9 +7,14 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
+#if !defined(OPERATION_COUNT)
+#define OPERATION_COUNT 100
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+
 #include <tmacros.h>
 #include <timesys.h>
 #include "test_support.h"
diff --git a/testsuites/psxtmtests/psxtmbarrierattr01/init.c b/testsuites/psxtmtests/psxtmbarrierattr01/init.c
index f1fa632f70..2e7429a720 100644
--- a/testsuites/psxtmtests/psxtmbarrierattr01/init.c
+++ b/testsuites/psxtmtests/psxtmbarrierattr01/init.c
@@ -25,6 +25,10 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if !defined(OPERATION_COUNT)
+#define OPERATION_COUNT 100
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/testsuites/psxtmtests/psxtmcleanup01/init.c b/testsuites/psxtmtests/psxtmcleanup01/init.c
index 0bca307a62..3bac0d909b 100644
--- a/testsuites/psxtmtests/psxtmcleanup01/init.c
+++ b/testsuites/psxtmtests/psxtmcleanup01/init.c
@@ -25,6 +25,10 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if !defined(OPERATION_COUNT)
+#define OPERATION_COUNT 100
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/testsuites/psxtmtests/psxtmcond08/init.c b/testsuites/psxtmtests/psxtmcond08/init.c
index 4839e5591d..7faffe1246 100644
--- a/testsuites/psxtmtests/psxtmcond08/init.c
+++ b/testsuites/psxtmtests/psxtmcond08/init.c
@@ -7,6 +7,10 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
+#if !defined(OPERATION_COUNT)
+#define OPERATION_COUNT 100
+#endif
+
 #if   defined(USE_WAIT)
   #define TEST_NUMBER "08"
   #define TEST_CASE "pthread_cond_wait: blocking"
diff --git a/testsuites/psxtmtests/psxtmmutex02/init.c b/testsuites/psxtmtests/psxtmmutex02/init.c
index 58689e618b..6cd29468a0 100644
--- a/testsuites/psxtmtests/psxtmmutex02/init.c
+++ b/testsuites/psxtmtests/psxtmmutex02/init.c
@@ -7,6 +7,10 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
+#if !defined(OPERATION_COUNT)
+#define OPERATION_COUNT 100
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -91,7 +95,7 @@ void *POSIX_Init(
     status = pthread_create( &threadId, NULL, Middle, NULL );
     rtems_test_assert( !status );
   }
-  
+
   status = pthread_create( &threadId, NULL, Low, NULL );
   rtems_test_assert( !status );
 
diff --git a/testsuites/psxtmtests/psxtmmutex06/init.c b/testsuites/psxtmtests/psxtmmutex06/init.c
index fe22753faf..402c1cca82 100644
--- a/testsuites/psxtmtests/psxtmmutex06/init.c
+++ b/testsuites/psxtmtests/psxtmmutex06/init.c
@@ -7,6 +7,10 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
+#if !defined(OPERATION_COUNT)
+#define OPERATION_COUNT 100
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -130,7 +134,7 @@ void *POSIX_Init(
     );
     rtems_test_assert( status == 0 );
   }
-  
+
   /*
    * Now start the timer which will be stopped in Low
    */
diff --git a/testsuites/psxtmtests/psxtmsem03/init.c b/testsuites/psxtmtests/psxtmsem03/init.c
index 5696145008..69ac86d070 100644
--- a/testsuites/psxtmtests/psxtmsem03/init.c
+++ b/testsuites/psxtmtests/psxtmsem03/init.c
@@ -7,6 +7,10 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
+#if !defined(OPERATION_COUNT)
+#define OPERATION_COUNT 100
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -93,7 +97,7 @@ void *POSIX_Init(
     status = pthread_create( &threadId, NULL, Middle, NULL );
     rtems_test_assert( status == 0 );
   }
-  
+
   status = pthread_create( &threadId, NULL, Low, NULL );
   rtems_test_assert( status == 0 );
 
diff --git a/testsuites/psxtmtests/psxtmthread01/init.c b/testsuites/psxtmtests/psxtmthread01/init.c
index 762ea3a6aa..c7c27559dc 100644
--- a/testsuites/psxtmtests/psxtmthread01/init.c
+++ b/testsuites/psxtmtests/psxtmthread01/init.c
@@ -7,6 +7,10 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
+#if !defined(OPERATION_COUNT)
+#define OPERATION_COUNT 100
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -58,7 +62,7 @@ void *POSIX_Init(
     0
   );
 
-  
+
   TEST_END();
 
   rtems_test_exit(0);
diff --git a/testsuites/sptests/sp71/init.c b/testsuites/sptests/sp71/init.c
index 7e6a7e591f..cc85f8fdc6 100644
--- a/testsuites/sptests/sp71/init.c
+++ b/testsuites/sptests/sp71/init.c
@@ -7,6 +7,10 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
+#if !defined(PER_ALLOCATION)
+#define PER_ALLOCATION 8000
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -16,8 +20,6 @@
 
 const char rtems_test_name[] = "SP 71";
 
-#define PER_ALLOCATION 8000
-
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 
diff --git a/testsuites/testdata/dltests-broken-on-this-bsp.tcfg b/testsuites/testdata/disable-libdl-tests.tcfg
similarity index 75%
rename from testsuites/testdata/dltests-broken-on-this-bsp.tcfg
rename to testsuites/testdata/disable-libdl-tests.tcfg
index 7132d46798..3185dbe4fc 100644
--- a/testsuites/testdata/dltests-broken-on-this-bsp.tcfg
+++ b/testsuites/testdata/disable-libdl-tests.tcfg
@@ -4,9 +4,4 @@
 # This file should be included by those BSPs which have dl* test issues
 # which remain to be investigated and solved.
 #
-exclude: dl01
-exclude: dl02
-exclude: dl03
-exclude: dl04
-exclude: dl05
-exclude: dl06
+rexclude: dl[0-9][0-9]
diff --git a/testsuites/testdata/small-memory-testsuite.tcfg b/testsuites/testdata/small-memory-testsuite.tcfg
new file mode 100644
index 0000000000..95cd2397b7
--- /dev/null
+++ b/testsuites/testdata/small-memory-testsuite.tcfg
@@ -0,0 +1,19 @@
+#
+# Small Memory RTEMS Test Database.
+#
+
+include: testdata/disable-iconv-tests.tcfg
+include: testdata/disable-libdl-tests.tcfg
+include: testdata/disable-jffs2-tests.tcfg
+
+exclude: flashdisk01
+exclude: fsdosfsname01
+exclude: linpack
+exclude: spstkalloc02
+exclude: sp47
+exclude: psxusleep
+exclude: psxconfig01
+
+cflags: sp71 : -DPER_ALLOCATION=10
+cflags: psxtm.*, tm.* : -DOPERATION_COUNT=3
+cflags: tmck : -DMAXIMUM_DISTRIBUTION=10
diff --git a/testsuites/tmtests/Makefile.am b/testsuites/tmtests/Makefile.am
index 08bad219cd..eb5d2dfeaa 100644
--- a/testsuites/tmtests/Makefile.am
+++ b/testsuites/tmtests/Makefile.am
@@ -19,7 +19,7 @@ tm_docs += tm01/tm01.doc
 tm01_SOURCES = tm01/task1.c tm01/system.h include/timesys.h \
 	../support/src/tmtests_empty_function.c
 tm01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_tm01) $(support_includes) \
-	-I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
+	-I$(top_srcdir)/include
 endif
 
 if TEST_tm02
@@ -28,7 +28,7 @@ tm_docs += tm02/tm02.doc
 tm02_SOURCES = tm02/task1.c tm02/system.h include/timesys.h \
 	../support/src/tmtests_empty_function.c
 tm02_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_tm02) $(support_includes) \
-	-I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT) -DTM02
+	-I$(top_srcdir)/include -DTM02
 endif
 
 if TEST_tm03
@@ -37,7 +37,7 @@ tm_docs += tm03/tm03.doc
 tm03_SOURCES = tm03/task1.c tm03/system.h include/timesys.h \
 	../support/src/tmtests_empty_function.c
 tm03_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_tm03) $(support_includes) \
-	-I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT) -DTM03
+	-I$(top_srcdir)/include -DTM03
 endif
 
 if TEST_tm04
@@ -46,7 +46,7 @@ tm_docs += tm04/tm04.doc
 tm04_SOURCES = tm04/task1.c tm04/system.h include/timesys.h \
 	../support/src/tmtests_empty_function.c
 tm04_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_tm04) $(support_includes) \
-	-I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
+	-I$(top_srcdir)/include
 endif
 
 if TEST_tm05
@@ -55,7 +55,7 @@ tm_docs += tm05/tm05.doc
 tm05_SOURCES = tm05/task1.c tm05/system.h include/timesys.h \
 	../support/src/tmtests_empty_function.c
 tm05_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_tm05) $(support_includes) \
-	-I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
+	-I$(top_srcdir)/include
 endif
 
 if TEST_tm06
@@ -64,7 +64,7 @@ tm_docs += tm06/tm06.doc
 tm06_SOURCES = tm06/task1.c tm06/system.h include/timesys.h \
 	../support/src/tmtests_empty_function.c
 tm06_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_tm06) $(support_includes) \
-	-I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
+	-I$(top_srcdir)/include
 endif
 
 if TEST_tm07
@@ -73,7 +73,7 @@ tm_docs += tm07/tm07.doc
 tm07_SOURCES = tm07/task1.c tm07/system.h include/timesys.h \
 	../support/src/tmtests_empty_function.c
 tm07_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_tm07) $(support_includes) \
-	-I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
+	-I$(top_srcdir)/include
 endif
 
 if TEST_tm08
@@ -82,7 +82,7 @@ tm_docs += tm08/tm08.doc
 tm08_SOURCES = tm08/task1.c tm08/system.h include/timesys.h \
 	../support/src/tmtests_empty_function.c
 tm08_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_tm08) $(support_includes) \
-	-I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
+	-I$(top_srcdir)/include
 endif
 
 if TEST_tm09
@@ -91,7 +91,7 @@ tm_docs += tm09/tm09.doc
 tm09_SOURCES = tm09/task1.c tm09/system.h include/timesys.h \
 	../support/src/tmtests_empty_function.c
 tm09_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_tm09) $(support_includes) \
-	-I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
+	-I$(top_srcdir)/include
 endif
 
 if TEST_tm10
@@ -100,7 +100,7 @@ tm_docs += tm10/tm10.doc
 tm10_SOURCES = tm10/task1.c tm10/system.h include/timesys.h \
 	../support/src/tmtests_empty_function.c
 tm10_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_tm10) $(support_includes) \
-	-I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
+	-I$(top_srcdir)/include
 endif
 
 if TEST_tm11
@@ -109,7 +109,7 @@ tm_docs += tm11/tm11.doc
 tm11_SOURCES = tm11/task1.c tm11/system.h include/timesys.h \
 	../support/src/tmtests_empty_function.c
 tm11_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_tm11) $(support_includes) \
-	-I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
+	-I$(top_srcdir)/include
 endif
 
 if TEST_tm12
@@ -118,7 +118,7 @@ tm_docs += tm12/tm12.doc
 tm12_SOURCES = tm12/task1.c tm12/system.h include/timesys.h \
 	../support/src/tmtests_empty_function.c
 tm12_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_tm12) $(support_includes) \
-	-I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
+	-I$(top_srcdir)/include
 endif
 
 if TEST_tm13
@@ -127,7 +127,7 @@ tm_docs += tm13/tm13.doc
 tm13_SOURCES = tm13/task1.c tm13/system.h include/timesys.h \
 	../support/src/tmtests_empty_function.c
 tm13_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_tm13) $(support_includes) \
-	-I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
+	-I$(top_srcdir)/include
 endif
 
 if TEST_tm14
@@ -136,7 +136,7 @@ tm_docs += tm14/tm14.doc
 tm14_SOURCES = tm14/task1.c tm14/system.h include/timesys.h \
 	../support/src/tmtests_empty_function.c
 tm14_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_tm14) $(support_includes) \
-	-I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
+	-I$(top_srcdir)/include
 endif
 
 if TEST_tm15
@@ -145,7 +145,7 @@ tm_docs += tm15/tm15.doc
 tm15_SOURCES = tm15/task1.c tm15/system.h include/timesys.h \
 	../support/src/tmtests_empty_function.c
 tm15_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_tm15) $(support_includes) \
-	-I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
+	-I$(top_srcdir)/include
 endif
 
 if TEST_tm16
@@ -154,7 +154,7 @@ tm_docs += tm16/tm16.doc
 tm16_SOURCES = tm16/task1.c tm16/system.h include/timesys.h \
 	../support/src/tmtests_empty_function.c
 tm16_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_tm16) $(support_includes) \
-	-I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
+	-I$(top_srcdir)/include
 endif
 
 if TEST_tm17
@@ -163,7 +163,7 @@ tm_docs += tm17/tm17.doc
 tm17_SOURCES = tm17/task1.c tm17/system.h include/timesys.h \
 	../support/src/tmtests_empty_function.c
 tm17_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_tm17) $(support_includes) \
-	-I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
+	-I$(top_srcdir)/include
 endif
 
 if TEST_tm18
@@ -172,7 +172,7 @@ tm_docs += tm18/tm18.doc
 tm18_SOURCES = tm18/task1.c tm18/system.h include/timesys.h \
 	../support/src/tmtests_empty_function.c
 tm18_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_tm18) $(support_includes) \
-	-I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
+	-I$(top_srcdir)/include
 endif
 
 if TEST_tm19
@@ -181,7 +181,7 @@ tm_docs += tm19/tm19.doc
 tm19_SOURCES = tm19/task1.c tm19/system.h include/timesys.h \
 	../support/src/tmtests_empty_function.c
 tm19_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_tm19) $(support_includes) \
-	-I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
+	-I$(top_srcdir)/include
 endif
 
 if TEST_tm20
@@ -190,7 +190,7 @@ tm_docs += tm20/tm20.doc
 tm20_SOURCES = tm20/task1.c tm20/system.h include/timesys.h \
 	../support/src/tmtests_empty_function.c
 tm20_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_tm20) $(support_includes) \
-	-I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
+	-I$(top_srcdir)/include
 endif
 
 if TEST_tm21
@@ -199,7 +199,7 @@ tm_docs += tm21/tm21.doc
 tm21_SOURCES = tm21/task1.c tm21/system.h include/timesys.h \
 	../support/src/tmtests_empty_function.c
 tm21_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_tm21) $(support_includes) \
-	-I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
+	-I$(top_srcdir)/include
 endif
 
 if TEST_tm22
@@ -208,7 +208,7 @@ tm_docs += tm22/tm22.doc
 tm22_SOURCES = tm22/task1.c tm22/system.h include/timesys.h \
 	../support/src/tmtests_empty_function.c
 tm22_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_tm22) $(support_includes) \
-	-I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
+	-I$(top_srcdir)/include
 endif
 
 if TEST_tm23
@@ -217,7 +217,7 @@ tm_docs += tm23/tm23.doc
 tm23_SOURCES = tm23/task1.c tm23/system.h include/timesys.h \
 	../support/src/tmtests_empty_function.c
 tm23_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_tm23) $(support_includes) \
-	-I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
+	-I$(top_srcdir)/include
 endif
 
 if TEST_tm24
@@ -226,7 +226,7 @@ tm_docs += tm24/tm24.doc
 tm24_SOURCES = tm24/task1.c tm24/system.h include/timesys.h \
 	../support/src/tmtests_empty_function.c
 tm24_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_tm24) $(support_includes) \
-	-I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
+	-I$(top_srcdir)/include
 endif
 
 if TEST_tm25
@@ -235,7 +235,7 @@ tm_docs += tm25/tm25.doc
 tm25_SOURCES = tm25/task1.c tm25/system.h include/timesys.h \
 	../support/src/tmtests_empty_function.c
 tm25_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_tm25) $(support_includes) \
-	-I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
+	-I$(top_srcdir)/include
 endif
 
 if TEST_tm26
@@ -244,7 +244,7 @@ tm_docs += tm26/tm26.doc
 tm26_SOURCES = tm26/task1.c tm26/system.h tm26/fptest.h \
 	include/timesys.h ../support/src/tmtests_empty_function.c
 tm26_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_tm26) $(support_includes) \
-	-I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
+	-I$(top_srcdir)/include
 endif
 
 if TEST_tm27
@@ -253,7 +253,7 @@ tm_docs += tm27/tm27.doc
 tm27_SOURCES = tm27/task1.c tm27/system.h include/timesys.h \
 	../support/src/tmtests_empty_function.c
 tm27_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_tm27) $(support_includes) \
-	-I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
+	-I$(top_srcdir)/include
 endif
 
 if TEST_tm28
@@ -262,7 +262,7 @@ tm_docs += tm28/tm28.doc
 tm28_SOURCES = tm28/task1.c tm28/system.h include/timesys.h \
 	../support/src/tmtests_empty_function.c
 tm28_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_tm28) $(support_includes) \
-	-I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
+	-I$(top_srcdir)/include
 endif
 
 if TEST_tm29
@@ -271,7 +271,7 @@ tm_docs += tm29/tm29.doc
 tm29_SOURCES = tm29/task1.c tm29/system.h include/timesys.h \
 	../support/src/tmtests_empty_function.c
 tm29_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_tm29) $(support_includes) \
-	-I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
+	-I$(top_srcdir)/include
 endif
 
 if TEST_tm30
@@ -281,7 +281,7 @@ tm30_SOURCES = tm30/init.c include/timesys.h \
 	../support/src/tmtests_empty_function.c \
 	../support/src/tmtests_support.c
 tm30_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_tm30) $(support_includes) \
-	-I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
+	-I$(top_srcdir)/include
 endif
 
 if TEST_tm31
@@ -290,8 +290,7 @@ tm_docs += tm31/tm31.doc
 tm31_SOURCES = tm02/task1.c tm02/system.h include/timesys.h \
 	../support/src/tmtests_empty_function.c
 tm31_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_tm31) $(support_includes) \
-	-I$(top_srcdir)/../tm02 -I$(top_srcdir)/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT) -DTM31
+	-I$(top_srcdir)/../tm02 -I$(top_srcdir)/include -DTM31
 endif
 
 if TEST_tm32
@@ -300,8 +299,7 @@ tm_docs += tm32/tm32.doc
 tm32_SOURCES = tm03/task1.c tm03/system.h include/timesys.h \
 	../support/src/tmtests_empty_function.c
 tm32_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_tm32) $(support_includes) \
-	-I$(top_srcdir)/../tm03 -I$(top_srcdir)/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT) -DTM32
+	-I$(top_srcdir)/../tm03 -I$(top_srcdir)/include -DTM32
 endif
 
 if TEST_tm33
@@ -310,8 +308,7 @@ tm_docs += tm33/tm33.doc
 tm33_SOURCES = tm02/task1.c tm02/system.h include/timesys.h \
 	../support/src/tmtests_empty_function.c
 tm33_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_tm33) $(support_includes) \
-	-I$(top_srcdir)/../tm02 -I$(top_srcdir)/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT) -DTM33
+	-I$(top_srcdir)/../tm02 -I$(top_srcdir)/include -DTM33
 endif
 
 if TEST_tm34
@@ -320,8 +317,7 @@ tm_docs += tm34/tm34.doc
 tm34_SOURCES = tm03/task1.c tm03/system.h include/timesys.h \
 	../support/src/tmtests_empty_function.c
 tm34_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_tm34) $(support_includes) \
-	-I$(top_srcdir)/../tm03 -I$(top_srcdir)/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT) -DTM34
+	-I$(top_srcdir)/../tm03 -I$(top_srcdir)/include -DTM34
 endif
 
 if TEST_tm35
@@ -330,8 +326,7 @@ tm_docs += tm35/tm35.doc
 tm35_SOURCES = tm02/task1.c tm02/system.h include/timesys.h \
 	../support/src/tmtests_empty_function.c
 tm35_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_tm35) $(support_includes) \
-	-I$(top_srcdir)/../tm02 -I$(top_srcdir)/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT) -DTM35
+	-I$(top_srcdir)/../tm02 -I$(top_srcdir)/include -DTM35
 endif
 
 if TEST_tm36
@@ -340,8 +335,7 @@ tm_docs += tm36/tm36.doc
 tm36_SOURCES = tm03/task1.c tm03/system.h include/timesys.h \
 	../support/src/tmtests_empty_function.c
 tm36_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_tm36) $(support_includes) \
-	-I$(top_srcdir)/../tm03 -I$(top_srcdir)/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT) -DTM36
+	-I$(top_srcdir)/../tm03 -I$(top_srcdir)/include -DTM36
 endif
 
 if TEST_tmck
@@ -350,7 +344,7 @@ tm_docs += tmck/tmck.doc
 tmck_SOURCES = tmck/task1.c tmck/system.h include/timesys.h \
 	../support/src/tmtests_empty_function.c
 tmck_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_tmck) $(support_includes) \
-	-I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
+	-I$(top_srcdir)/include
 endif
 
 if TEST_tmcontext01
@@ -387,8 +381,7 @@ tmoverhd_SOURCES = tmoverhd/testtask.c tmoverhd/empty.c \
 	tmoverhd/system.h tmoverhd/dumrtems.h include/timesys.h \
 	../support/src/tmtests_empty_function.c
 tmoverhd_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_tmoverhd) \
-	$(support_includes) -I$(top_srcdir)/include \
-	-DOPERATION_COUNT=$(OPERATION_COUNT)
+	$(support_includes) -I$(top_srcdir)/include
 endif
 
 if TEST_tmtimer01
diff --git a/testsuites/tmtests/configure.ac b/testsuites/tmtests/configure.ac
index 90707453dc..c5b36f32b8 100644
--- a/testsuites/tmtests/configure.ac
+++ b/testsuites/tmtests/configure.ac
@@ -24,9 +24,6 @@ RTEMS_CANONICALIZE_TOOLS
 
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 
-OPERATION_COUNT=${OPERATION_COUNT-100}
-AC_SUBST(OPERATION_COUNT)
-
 # BSP Test configuration
 RTEMS_TEST_CHECK([tm01])
 RTEMS_TEST_CHECK([tm02])
diff --git a/testsuites/tmtests/tm01/task1.c b/testsuites/tmtests/tm01/task1.c
index c2549701bc..ce19c5a874 100644
--- a/testsuites/tmtests/tm01/task1.c
+++ b/testsuites/tmtests/tm01/task1.c
@@ -7,6 +7,10 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
+#if !defined(OPERATION_COUNT)
+#define OPERATION_COUNT 100
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/testsuites/tmtests/tm02/task1.c b/testsuites/tmtests/tm02/task1.c
index f9e159929a..8fe1bfd08f 100644
--- a/testsuites/tmtests/tm02/task1.c
+++ b/testsuites/tmtests/tm02/task1.c
@@ -7,6 +7,10 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
+#if !defined(OPERATION_COUNT)
+#define OPERATION_COUNT 100
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/testsuites/tmtests/tm03/task1.c b/testsuites/tmtests/tm03/task1.c
index 63c21c2d45..50bbe1b4d2 100644
--- a/testsuites/tmtests/tm03/task1.c
+++ b/testsuites/tmtests/tm03/task1.c
@@ -7,6 +7,10 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
+#if !defined(OPERATION_COUNT)
+#define OPERATION_COUNT 100
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/testsuites/tmtests/tm04/task1.c b/testsuites/tmtests/tm04/task1.c
index 54ac8f2bf3..af78e940b2 100644
--- a/testsuites/tmtests/tm04/task1.c
+++ b/testsuites/tmtests/tm04/task1.c
@@ -7,6 +7,10 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
+#if !defined(OPERATION_COUNT)
+#define OPERATION_COUNT 100
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/testsuites/tmtests/tm06/task1.c b/testsuites/tmtests/tm06/task1.c
index 86c9c586d9..4983f5df33 100644
--- a/testsuites/tmtests/tm06/task1.c
+++ b/testsuites/tmtests/tm06/task1.c
@@ -7,6 +7,10 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
+#if !defined(OPERATION_COUNT)
+#define OPERATION_COUNT 100
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/testsuites/tmtests/tm07/task1.c b/testsuites/tmtests/tm07/task1.c
index b849de5948..f54388feb6 100644
--- a/testsuites/tmtests/tm07/task1.c
+++ b/testsuites/tmtests/tm07/task1.c
@@ -7,6 +7,10 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
+#if !defined(OPERATION_COUNT)
+#define OPERATION_COUNT 100
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/testsuites/tmtests/tm08/task1.c b/testsuites/tmtests/tm08/task1.c
index ad38a54c76..5d013a6f71 100644
--- a/testsuites/tmtests/tm08/task1.c
+++ b/testsuites/tmtests/tm08/task1.c
@@ -7,6 +7,10 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
+#if !defined(OPERATION_COUNT)
+#define OPERATION_COUNT 100
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/testsuites/tmtests/tm09/task1.c b/testsuites/tmtests/tm09/task1.c
index 9caf4d9d14..8f7edf3163 100644
--- a/testsuites/tmtests/tm09/task1.c
+++ b/testsuites/tmtests/tm09/task1.c
@@ -7,6 +7,10 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
+#if !defined(OPERATION_COUNT)
+#define OPERATION_COUNT 100
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/testsuites/tmtests/tm10/task1.c b/testsuites/tmtests/tm10/task1.c
index 3a62fcdc9d..c5e7d6ea64 100644
--- a/testsuites/tmtests/tm10/task1.c
+++ b/testsuites/tmtests/tm10/task1.c
@@ -7,6 +7,10 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
+#if !defined(OPERATION_COUNT)
+#define OPERATION_COUNT 100
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/testsuites/tmtests/tm11/task1.c b/testsuites/tmtests/tm11/task1.c
index a83cf48386..23f78d99f8 100644
--- a/testsuites/tmtests/tm11/task1.c
+++ b/testsuites/tmtests/tm11/task1.c
@@ -7,6 +7,10 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
+#if !defined(OPERATION_COUNT)
+#define OPERATION_COUNT 100
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/testsuites/tmtests/tm12/task1.c b/testsuites/tmtests/tm12/task1.c
index 1c13de8fc5..9892fbfda7 100644
--- a/testsuites/tmtests/tm12/task1.c
+++ b/testsuites/tmtests/tm12/task1.c
@@ -7,6 +7,10 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
+#if !defined(OPERATION_COUNT)
+#define OPERATION_COUNT 100
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/testsuites/tmtests/tm13/task1.c b/testsuites/tmtests/tm13/task1.c
index d61852c404..a9962cb5ba 100644
--- a/testsuites/tmtests/tm13/task1.c
+++ b/testsuites/tmtests/tm13/task1.c
@@ -7,6 +7,10 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
+#if !defined(OPERATION_COUNT)
+#define OPERATION_COUNT 100
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/testsuites/tmtests/tm14/task1.c b/testsuites/tmtests/tm14/task1.c
index 4b94c579c3..64003c2903 100644
--- a/testsuites/tmtests/tm14/task1.c
+++ b/testsuites/tmtests/tm14/task1.c
@@ -7,6 +7,10 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
+#if !defined(OPERATION_COUNT)
+#define OPERATION_COUNT 100
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/testsuites/tmtests/tm15/task1.c b/testsuites/tmtests/tm15/task1.c
index 65b42d22fd..6573e671d2 100644
--- a/testsuites/tmtests/tm15/task1.c
+++ b/testsuites/tmtests/tm15/task1.c
@@ -7,6 +7,10 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
+#if !defined(OPERATION_COUNT)
+#define OPERATION_COUNT 100
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/testsuites/tmtests/tm16/task1.c b/testsuites/tmtests/tm16/task1.c
index 4cd6fabe72..0b7c53395f 100644
--- a/testsuites/tmtests/tm16/task1.c
+++ b/testsuites/tmtests/tm16/task1.c
@@ -7,6 +7,10 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
+#if !defined(OPERATION_COUNT)
+#define OPERATION_COUNT 100
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/testsuites/tmtests/tm17/task1.c b/testsuites/tmtests/tm17/task1.c
index fb49796de6..f43d6860b7 100644
--- a/testsuites/tmtests/tm17/task1.c
+++ b/testsuites/tmtests/tm17/task1.c
@@ -7,6 +7,10 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
+#if !defined(OPERATION_COUNT)
+#define OPERATION_COUNT 100
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/testsuites/tmtests/tm18/task1.c b/testsuites/tmtests/tm18/task1.c
index 91df7bea81..d3b6bb43f9 100644
--- a/testsuites/tmtests/tm18/task1.c
+++ b/testsuites/tmtests/tm18/task1.c
@@ -7,6 +7,10 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
+#if !defined(OPERATION_COUNT)
+#define OPERATION_COUNT 100
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/testsuites/tmtests/tm20/task1.c b/testsuites/tmtests/tm20/task1.c
index d84dbf4d29..28fe864f80 100644
--- a/testsuites/tmtests/tm20/task1.c
+++ b/testsuites/tmtests/tm20/task1.c
@@ -7,6 +7,10 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
+#if !defined(OPERATION_COUNT)
+#define OPERATION_COUNT 100
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/testsuites/tmtests/tm21/task1.c b/testsuites/tmtests/tm21/task1.c
index 0b96dddd90..fb9f14a4d5 100644
--- a/testsuites/tmtests/tm21/task1.c
+++ b/testsuites/tmtests/tm21/task1.c
@@ -7,6 +7,10 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
+#if !defined(OPERATION_COUNT)
+#define OPERATION_COUNT 100
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/testsuites/tmtests/tm22/task1.c b/testsuites/tmtests/tm22/task1.c
index 665eaaec70..1332a124e6 100644
--- a/testsuites/tmtests/tm22/task1.c
+++ b/testsuites/tmtests/tm22/task1.c
@@ -8,6 +8,10 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
+#if !defined(OPERATION_COUNT)
+#define OPERATION_COUNT 100
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/testsuites/tmtests/tm23/task1.c b/testsuites/tmtests/tm23/task1.c
index f8a6f27991..318caaa74e 100644
--- a/testsuites/tmtests/tm23/task1.c
+++ b/testsuites/tmtests/tm23/task1.c
@@ -7,6 +7,10 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
+#if !defined(OPERATION_COUNT)
+#define OPERATION_COUNT 100
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/testsuites/tmtests/tm24/task1.c b/testsuites/tmtests/tm24/task1.c
index 53a4d4e815..a4e8a9e6fd 100644
--- a/testsuites/tmtests/tm24/task1.c
+++ b/testsuites/tmtests/tm24/task1.c
@@ -7,6 +7,10 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
+#if !defined(OPERATION_COUNT)
+#define OPERATION_COUNT 100
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/testsuites/tmtests/tm25/task1.c b/testsuites/tmtests/tm25/task1.c
index e5795ce120..3bf7508435 100644
--- a/testsuites/tmtests/tm25/task1.c
+++ b/testsuites/tmtests/tm25/task1.c
@@ -7,6 +7,10 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
+#if !defined(OPERATION_COUNT)
+#define OPERATION_COUNT 100
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/testsuites/tmtests/tm26/task1.c b/testsuites/tmtests/tm26/task1.c
index 483ddbe0d9..1aff78da65 100644
--- a/testsuites/tmtests/tm26/task1.c
+++ b/testsuites/tmtests/tm26/task1.c
@@ -7,6 +7,10 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
+#if !defined(OPERATION_COUNT)
+#define OPERATION_COUNT 100
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/testsuites/tmtests/tm28/task1.c b/testsuites/tmtests/tm28/task1.c
index 2e328beea0..2f2306bdd9 100644
--- a/testsuites/tmtests/tm28/task1.c
+++ b/testsuites/tmtests/tm28/task1.c
@@ -7,6 +7,10 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
+#if !defined(OPERATION_COUNT)
+#define OPERATION_COUNT 100
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/testsuites/tmtests/tm29/task1.c b/testsuites/tmtests/tm29/task1.c
index 648249e6a6..a26b504be8 100644
--- a/testsuites/tmtests/tm29/task1.c
+++ b/testsuites/tmtests/tm29/task1.c
@@ -7,6 +7,10 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
+#if !defined(OPERATION_COUNT)
+#define OPERATION_COUNT 100
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/testsuites/tmtests/tm30/init.c b/testsuites/tmtests/tm30/init.c
index d35ce65d46..b2f1b335ab 100644
--- a/testsuites/tmtests/tm30/init.c
+++ b/testsuites/tmtests/tm30/init.c
@@ -7,6 +7,10 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
+#if !defined(OPERATION_COUNT)
+#define OPERATION_COUNT 100
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -76,7 +80,7 @@ rtems_task Init(
     OPERATION_COUNT,
     0
   );
-  
+
   rtems_time_test_measure_operation(
     "rtems_barrier_ident: only case",
     benchmark_barrier_ident,
@@ -84,7 +88,7 @@ rtems_task Init(
     OPERATION_COUNT,
     0
   );
-  
+
   rtems_time_test_measure_operation(
     "rtems_barrier_delete: only case",
     benchmark_barrier_delete,
@@ -92,7 +96,7 @@ rtems_task Init(
     OPERATION_COUNT,
     0
   );
-  
+
   TEST_END();
 
   rtems_test_exit(0);
diff --git a/testsuites/tmtests/tmck/task1.c b/testsuites/tmtests/tmck/task1.c
index e6e9f78fab..f509e839d3 100644
--- a/testsuites/tmtests/tmck/task1.c
+++ b/testsuites/tmtests/tmck/task1.c
@@ -7,6 +7,9 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
+#if !defined(OPERATION_COUNT)
+#define OPERATION_COUNT 100
+#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -15,10 +18,9 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+#if !defined(MAXIMUM_DISTRIBUTION)
 #define MAXIMUM_DISTRIBUTION 1000
-
-#undef OPERATION_COUNT
-#define OPERATION_COUNT    100000
+#endif
 
 const char rtems_test_name[] = "TIME CHECKER";
 
diff --git a/testsuites/tmtests/tmoverhd/testtask.c b/testsuites/tmtests/tmoverhd/testtask.c
index 88f9f0bc32..532fa34d42 100644
--- a/testsuites/tmtests/tmoverhd/testtask.c
+++ b/testsuites/tmtests/tmoverhd/testtask.c
@@ -7,6 +7,10 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
+#if !defined(OPERATION_COUNT)
+#define OPERATION_COUNT 100
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-- 
2.19.1

More information about the devel mailing list