testsuite: Make the OPERATION_COUNT a test configuration parameter.

- Add a small memory test config file.
- Update the small memory PowerPC BSPs to use the new test config.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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])
 ])

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;
-  
-}
 
+  return NULL;
+
+}

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
 

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

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 );
 

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

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"

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

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

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"

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 );
 

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
    */

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 );
 

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);

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);
 

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]

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

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

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])

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

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

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

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

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

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

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

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

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