rhealstone: Add rh prefix to all test names

This makes them easier to spot as a group in wildcard searches.

testsuites/rhealstone/Makefile.am

@@ -1,6 +1,11 @@
 ACLOCAL_AMFLAGS = -I ../aclocal
 
-SUBDIRS = taskswitch taskpreempt ilatency mlatency semshuffle deadlockbrk
+SUBDIRS  = rhtaskswitch
+SUBDIRS += rhtaskpreempt
+SUBDIRS += rhilatency
+SUBDIRS += rhmlatency
+SUBDIRS += rhsemshuffle
+SUBDIRS += rhdeadlockbrk
 
 include $(top_srcdir)/../automake/subdirs.am
 include $(top_srcdir)/../automake/local.am

testsuites/rhealstone/configure.ac

@@ -2,7 +2,7 @@
 
 AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-tests-rhealstone],[_RTEMS_VERSION],[http://www.rtems.org/bugzilla])
-AC_CONFIG_SRCDIR([taskswitch])
+AC_CONFIG_SRCDIR([rhtaskswitch])
 AC_CONFIG_HEADER([config.h])
 RTEMS_TOP([../..],[..])
 
@@ -25,11 +25,11 @@ RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 
 # Explicitly list all Makefiles here
 AC_CONFIG_FILES([Makefile
-taskswitch/Makefile
-taskpreempt/Makefile
-ilatency/Makefile
-mlatency/Makefile
-semshuffle/Makefile
-deadlockbrk/Makefile
+rhtaskswitch/Makefile
+rhtaskpreempt/Makefile
+rhilatency/Makefile
+rhmlatency/Makefile
+rhsemshuffle/Makefile
+rhdeadlockbrk/Makefile
 ])
 AC_OUTPUT

testsuites/rhealstone/deadlockbrk/Makefile.am

@@ -1,23 +0,0 @@
-MANAGERS = all
-
-rtems_tests_PROGRAMS = deadlockbrk
-deadlockbrk_SOURCES  = deadlockbrk.c
-deadlockbrk_SOURCES += ../../tmtests/include/timesys.h
-
-dist_rtems_tests_DATA = deadlockbrk.adoc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../tmtests/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(deadlockbrk_OBJECTS) $(deadlockbrk_LDADD)
-LINK_LIBS = $(deadlockbrk_LDLIBS)
-
-deadlockbrk$(EXEEXT): $(deadlockbrk_OBJECTS) $(deadlockbrk_DEPENDENCIES)
-	@rm -f deadlockbrk$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am

testsuites/rhealstone/ilatency/Makefile.am

@@ -1,23 +0,0 @@
-MANAGERS = all
-
-rtems_tests_PROGRAMS = ilatency
-ilatency_SOURCES  = ilatency.c
-ilatency_SOURCES += ../../tmtests/include/timesys.h
-
-dist_rtems_tests_DATA = ilatency.adoc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../tmtests/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(ilatency_OBJECTS) $(ilatency_LDADD)
-LINK_LIBS = $(ilatency_LDLIBS)
-
-ilatency$(EXEEXT): $(ilatency_OBJECTS) $(ilatency_DEPENDENCIES)
-	@rm -f ilatency$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am

testsuites/rhealstone/mlatency/Makefile.am

@@ -1,23 +0,0 @@
-MANAGERS = all
-
-rtems_tests_PROGRAMS = mlatency
-mlatency_SOURCES  = mlatency.c
-mlatency_SOURCES += ../../tmtests/include/timesys.h
-
-dist_rtems_tests_DATA = mlatency.adoc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../tmtests/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(mlatency_OBJECTS) $(mlatency_LDADD)
-LINK_LIBS = $(mlatency_LDLIBS)
-
-mlatency$(EXEEXT): $(mlatency_OBJECTS) $(mlatency_DEPENDENCIES)
-	@rm -f mlatency$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am

testsuites/rhealstone/rhdeadlockbrk/Makefile.am

@@ -0,0 +1,23 @@
+MANAGERS = all
+
+rtems_tests_PROGRAMS = rhdeadlockbrk
+rhdeadlockbrk_SOURCES  = deadlockbrk.c
+rhdeadlockbrk_SOURCES += ../../tmtests/include/timesys.h
+
+dist_rtems_tests_DATA = rhdeadlockbrk.adoc
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
+
+AM_CPPFLAGS += -I$(top_srcdir)/../tmtests/include
+AM_CPPFLAGS += -I$(top_srcdir)/../support/include
+
+LINK_OBJS = $(rhdeadlockbrk_OBJECTS) $(rhdeadlockbrk_LDADD)
+LINK_LIBS = $(rhdeadlockbrk_LDLIBS)
+
+rhdeadlockbrk$(EXEEXT): $(rhdeadlockbrk_OBJECTS) $(rhdeadlockbrk_DEPENDENCIES)
+	@rm -f rhdeadlockbrk$(EXEEXT)
+	$(make-exe)
+
+include $(top_srcdir)/../automake/local.am

testsuites/rhealstone/rhdeadlockbrk/deadlockbrk.c

@@ -200,9 +200,11 @@ rtems_task Task03( rtems_task_argument ignored )
 /* configuration information */
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER
+
 #define CONFIGURE_TICKS_PER_TIMESLICE        0
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 #define CONFIGURE_MAXIMUM_SEMAPHORES 1
 #define CONFIGURE_MAXIMUM_TASKS 4
+
 #define CONFIGURE_INIT
 #include <rtems/confdefs.h>

testsuites/rhealstone/rhilatency/Makefile.am

@@ -0,0 +1,23 @@
+MANAGERS = all
+
+rtems_tests_PROGRAMS = rhilatency
+rhilatency_SOURCES  = ilatency.c
+rhilatency_SOURCES += ../../tmtests/include/timesys.h
+
+dist_rtems_tests_DATA = rhilatency.adoc
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
+
+AM_CPPFLAGS += -I$(top_srcdir)/../tmtests/include
+AM_CPPFLAGS += -I$(top_srcdir)/../support/include
+
+LINK_OBJS = $(rhilatency_OBJECTS) $(rhilatency_ldaDD)
+LINK_LIBS = $(rhilatency_LDLIBS)
+
+rhilatency$(EXEEXT): $(rhilatency_OBJECTS) $(rhilatency_DEPENDENCIES)
+	@rm -f rhilatency$(EXEEXT)
+	$(make-exe)
+
+include $(top_srcdir)/../automake/local.am

testsuites/rhealstone/rhmlatency/Makefile.am

@@ -0,0 +1,23 @@
+MANAGERS = all
+
+rtems_tests_PROGRAMS = rhmlatency
+rhmlatency_SOURCES  = mlatency.c
+rhmlatency_SOURCES += ../../tmtests/include/timesys.h
+
+dist_rtems_tests_DATA = rhmlatency.adoc
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
+
+AM_CPPFLAGS += -I$(top_srcdir)/../tmtests/include
+AM_CPPFLAGS += -I$(top_srcdir)/../support/include
+
+LINK_OBJS = $(rhmlatency_OBJECTS) $(rhmlatency_ldaDD)
+LINK_LIBS = $(rhmlatency_LDLIBS)
+
+rhmlatency$(EXEEXT): $(rhmlatency_OBJECTS) $(rhmlatency_DEPENDENCIES)
+	@rm -f rhmlatency$(EXEEXT)
+	$(make-exe)
+
+include $(top_srcdir)/../automake/local.am

testsuites/rhealstone/rhmlatency/mlatency.c

@@ -128,11 +128,11 @@ rtems_task Task02( rtems_task_argument ignored )
   telapsed = benchmark_timer_read();
 
   put_time(
-     "Rhealstone: Intertask Message Latency",
-     telapsed,                     /* Total time of all benchmarks */
-     BENCHMARKS - 1,               /* Total benchmarks */
-     tloop_overhead,               /* Overhead of loops */
-     treceive_overhead             /* Overhead of recieve call and task switch */
+   "Rhealstone: Intertask Message Latency",
+   telapsed,                     /* Total time of all benchmarks */
+   BENCHMARKS - 1,               /* Total benchmarks */
+   tloop_overhead,               /* Overhead of loops */
+   treceive_overhead             /* Overhead of recieve call and task switch */
   );
 
   rtems_test_exit( 0 );
@@ -146,7 +146,7 @@ rtems_task Task02( rtems_task_argument ignored )
 #define CONFIGURE_MAXIMUM_TASKS              3
 #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES     1
 #define CONFIGURE_TICKS_PER_TIMESLICE        0
-#define CONFIGURE_INIT
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
+#define CONFIGURE_INIT
 #include <rtems/confdefs.h>

testsuites/rhealstone/rhsemshuffle/Makefile.am

@@ -0,0 +1,23 @@
+MANAGERS = all
+
+rtems_tests_PROGRAMS = rhsemshuffle
+rhsemshuffle_SOURCES  = semshuffle.c
+rhsemshuffle_SOURCES += ../../tmtests/include/timesys.h
+
+dist_rtems_tests_DATA = rhsemshuffle.adoc
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
+
+AM_CPPFLAGS += -I$(top_srcdir)/../tmtests/include
+AM_CPPFLAGS += -I$(top_srcdir)/../support/include
+
+LINK_OBJS = $(rhsemshuffle_OBJECTS) $(rhsemshuffle_LDADD)
+LINK_LIBS = $(rhsemshuffle_LDLIBS)
+
+rhsemshuffle$(EXEEXT): $(rhsemshuffle_OBJECTS) $(rhsemshuffle_DEPENDENCIES)
+	@rm -f rhsemshuffle$(EXEEXT)
+	$(make-exe)
+
+include $(top_srcdir)/../automake/local.am

testsuites/rhealstone/rhtaskpreempt/Makefile.am

@@ -0,0 +1,23 @@
+MANAGERS = all
+
+rtems_tests_PROGRAMS = rhtaskpreempt
+rhtaskpreempt_SOURCES  = taskpreempt.c
+rhtaskpreempt_SOURCES += ../../tmtests/include/timesys.h
+
+dist_rtems_tests_DATA = rhtaskpreempt.adoc
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
+
+AM_CPPFLAGS += -I$(top_srcdir)/../tmtests/include
+AM_CPPFLAGS += -I$(top_srcdir)/../support/include
+
+LINK_OBJS = $(rhtaskpreempt_OBJECTS) $(rhtaskpreempt_LDADD)
+LINK_LIBS = $(rhtaskpreempt_LDLIBS)
+
+rhtaskpreempt$(EXEEXT): $(rhtaskpreempt_OBJECTS) $(rhtaskpreempt_DEPENDENCIES)
+	@rm -f rhtaskpreempt$(EXEEXT)
+	$(make-exe)
+
+include $(top_srcdir)/../automake/local.am

testsuites/rhealstone/rhtaskswitch/Makefile.am

@@ -0,0 +1,23 @@
+MANAGERS = all
+
+rtems_tests_PROGRAMS = rhtaskswitch
+rhtaskswitch_SOURCES  = taskswitch.c
+rhtaskswitch_SOURCES += ../../tmtests/include/timesys.h
+
+dist_rtems_tests_DATA = rhtaskswitch.adoc
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
+
+AM_CPPFLAGS += -I$(top_srcdir)/../tmtests/include
+AM_CPPFLAGS += -I$(top_srcdir)/../support/include
+
+LINK_OBJS = $(rhtaskswitch_OBJECTS) $(rhtaskswitch_LDADD)
+LINK_LIBS = $(rhtaskswitch_LDLIBS)
+
+rhtaskswitch$(EXEEXT): $(rhtaskswitch_OBJECTS) $(rhtaskswitch_DEPENDENCIES)
+	@rm -f rhtaskswitch$(EXEEXT)
+	$(make-exe)
+
+include $(top_srcdir)/../automake/local.am

testsuites/rhealstone/semshuffle/Makefile.am

@@ -1,23 +0,0 @@
-MANAGERS = all
-
-rtems_tests_PROGRAMS = semshuffle
-semshuffle_SOURCES  = semshuffle.c
-semshuffle_SOURCES += ../../tmtests/include/timesys.h
-
-dist_rtems_tests_DATA = semshuffle.adoc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../tmtests/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(semshuffle_OBJECTS) $(semshuffle_LDADD)
-LINK_LIBS = $(semshuffle_LDLIBS)
-
-semshuffle$(EXEEXT): $(semshuffle_OBJECTS) $(semshuffle_DEPENDENCIES)
-	@rm -f semshuffle$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am

testsuites/rhealstone/taskpreempt/Makefile.am

@@ -1,23 +0,0 @@
-MANAGERS = all
-
-rtems_tests_PROGRAMS = taskpreempt
-taskpreempt_SOURCES  = taskpreempt.c
-taskpreempt_SOURCES += ../../tmtests/include/timesys.h
-
-dist_rtems_tests_DATA = taskpreempt.adoc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../tmtests/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(taskpreempt_OBJECTS) $(taskpreempt_LDADD)
-LINK_LIBS = $(taskpreempt_LDLIBS)
-
-taskpreempt$(EXEEXT): $(taskpreempt_OBJECTS) $(taskpreempt_DEPENDENCIES)
-	@rm -f taskpreempt$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am

testsuites/rhealstone/taskswitch/Makefile.am

@@ -1,23 +0,0 @@
-MANAGERS = all
-
-rtems_tests_PROGRAMS = taskswitch
-taskswitch_SOURCES  = taskswitch.c
-taskswitch_SOURCES += ../../tmtests/include/timesys.h
-
-dist_rtems_tests_DATA = taskswitch.adoc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../tmtests/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(taskswitch_OBJECTS) $(taskswitch_LDADD)
-LINK_LIBS = $(taskswitch_LDLIBS)
-
-taskswitch$(EXEEXT): $(taskswitch_OBJECTS) $(taskswitch_DEPENDENCIES)
-	@rm -f taskswitch$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am