2011-06-22 Joel Sherrill <joel.sherrill@oarcorp.com>

	* psxtest/TEST.doc, psxtest/init.c, psxtest_with_thread/TEST.doc,
	psxtest_with_thread/init.c, psxtmtest_blocking/TEST.doc,
	psxtmtest_blocking/init.c, psxtmtest_single/TEST.doc,
	smptest/TEST.doc, spfatal/TEST.doc, spfatal/testcase.h,
	sptest/TEST.doc, sptest/init.c, sptest_operation_from_tsr/TEST.doc,
	sptest_operation_from_tsr/init.c, sptest_with_task/TEST.doc,
	sptest_with_task/init.c, tmtest/TEST.doc, tmtest/init.c: Tidy up.

19 files changed, 38 insertions, 25 deletions

diff --git a/rtems-test-template/ChangeLog b/rtems-test-template/ChangeLog
index f4b3e8f..ec5c19d 100644
--- a/rtems-test-template/ChangeLog
+++ b/rtems-test-template/ChangeLog
@@ -1,3 +1,13 @@
+2011-06-22	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* psxtest/TEST.doc, psxtest/init.c, psxtest_with_thread/TEST.doc,
+	psxtest_with_thread/init.c, psxtmtest_blocking/TEST.doc,
+	psxtmtest_blocking/init.c, psxtmtest_single/TEST.doc,
+	smptest/TEST.doc, spfatal/TEST.doc, spfatal/testcase.h,
+	sptest/TEST.doc, sptest/init.c, sptest_operation_from_tsr/TEST.doc,
+	sptest_operation_from_tsr/init.c, sptest_with_task/TEST.doc,
+	sptest_with_task/init.c, tmtest/TEST.doc, tmtest/init.c: Tidy up.
+
 2011-06-13	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* smptest/Makefile.am: New file.
diff --git a/rtems-test-template/psxtest/TEST.doc b/rtems-test-template/psxtest/TEST.doc
index 5c5378c..8598b00 100644
--- a/rtems-test-template/psxtest/TEST.doc
+++ b/rtems-test-template/psxtest/TEST.doc
@@ -1,7 +1,7 @@
 #
 #  $Id$
 #
-#  COPYRIGHT (c) 1989-2010.
+#  COPYRIGHT (c) 1989-2011.
 #  On-Line Applications Research Corporation (OAR).
 #
 #  The license and distribution terms for this file may be
diff --git a/rtems-test-template/psxtest/init.c b/rtems-test-template/psxtest/init.c
index 66a5986..7fe2535 100644
--- a/rtems-test-template/psxtest/init.c
+++ b/rtems-test-template/psxtest/init.c
@@ -1,5 +1,5 @@
 /*
- *  COPYRIGHT (c) 1989-2010.
+ *  COPYRIGHT (c) 1989-2011.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
diff --git a/rtems-test-template/psxtest_with_thread/TEST.doc b/rtems-test-template/psxtest_with_thread/TEST.doc
index 5c5378c..8598b00 100644
--- a/rtems-test-template/psxtest_with_thread/TEST.doc
+++ b/rtems-test-template/psxtest_with_thread/TEST.doc
@@ -1,7 +1,7 @@
 #
 #  $Id$
 #
-#  COPYRIGHT (c) 1989-2010.
+#  COPYRIGHT (c) 1989-2011.
 #  On-Line Applications Research Corporation (OAR).
 #
 #  The license and distribution terms for this file may be
diff --git a/rtems-test-template/psxtest_with_thread/init.c b/rtems-test-template/psxtest_with_thread/init.c
index 1f31ef8..82eff69 100644
--- a/rtems-test-template/psxtest_with_thread/init.c
+++ b/rtems-test-template/psxtest_with_thread/init.c
@@ -1,5 +1,5 @@
 /*
- *  COPYRIGHT (c) 1989-2010.
+ *  COPYRIGHT (c) 1989-2011.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
diff --git a/rtems-test-template/psxtmtest_blocking/TEST.doc b/rtems-test-template/psxtmtest_blocking/TEST.doc
index 1520da7..dc56765 100644
--- a/rtems-test-template/psxtmtest_blocking/TEST.doc
+++ b/rtems-test-template/psxtmtest_blocking/TEST.doc
@@ -1,7 +1,7 @@
 #
 #  $Id$
 #
-#  COPYRIGHT (c) 1989-2010.
+#  COPYRIGHT (c) 1989-2011.
 #  On-Line Applications Research Corporation (OAR).
 #
 #  The license and distribution terms for this file may be
@@ -11,4 +11,4 @@
 
 This test benchmarks the following operations:
 
-+ TBD
++ @DESC@
diff --git a/rtems-test-template/psxtmtest_blocking/init.c b/rtems-test-template/psxtmtest_blocking/init.c
index d092ea4..6f6d83c 100644
--- a/rtems-test-template/psxtmtest_blocking/init.c
+++ b/rtems-test-template/psxtmtest_blocking/init.c
@@ -1,5 +1,5 @@
 /*
- *  COPYRIGHT (c) 1989-2010.
+ *  COPYRIGHT (c) 1989-2011.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -9,12 +9,15 @@
  *  $Id$
  */
 
-#include <coverhd.h>
-#include <tmacros.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <timesys.h>
+#include <rtems/timerdrv.h>
 #include "test_support.h"
+
 #include <pthread.h>
-#include <rtems/timerdrv.h>
 
 void *Low(
   void *argument
@@ -25,7 +28,7 @@ void *Low(
   end_time = benchmark_timer_read();
 
   put_time(
-    "XXX",
+    "@DESC@",
     end_time,
     OPERATION_COUNT,
     0,
diff --git a/rtems-test-template/psxtmtest_single/TEST.doc b/rtems-test-template/psxtmtest_single/TEST.doc
index 1520da7..dc56765 100644
--- a/rtems-test-template/psxtmtest_single/TEST.doc
+++ b/rtems-test-template/psxtmtest_single/TEST.doc
@@ -1,7 +1,7 @@
 #
 #  $Id$
 #
-#  COPYRIGHT (c) 1989-2010.
+#  COPYRIGHT (c) 1989-2011.
 #  On-Line Applications Research Corporation (OAR).
 #
 #  The license and distribution terms for this file may be
@@ -11,4 +11,4 @@
 
 This test benchmarks the following operations:
 
-+ TBD
++ @DESC@
diff --git a/rtems-test-template/smptest/TEST.doc b/rtems-test-template/smptest/TEST.doc
index 5c5378c..8598b00 100644
--- a/rtems-test-template/smptest/TEST.doc
+++ b/rtems-test-template/smptest/TEST.doc
@@ -1,7 +1,7 @@
 #
 #  $Id$
 #
-#  COPYRIGHT (c) 1989-2010.
+#  COPYRIGHT (c) 1989-2011.
 #  On-Line Applications Research Corporation (OAR).
 #
 #  The license and distribution terms for this file may be
diff --git a/rtems-test-template/spfatal/TEST.doc b/rtems-test-template/spfatal/TEST.doc
index 5c5378c..8598b00 100644
--- a/rtems-test-template/spfatal/TEST.doc
+++ b/rtems-test-template/spfatal/TEST.doc
@@ -1,7 +1,7 @@
 #
 #  $Id$
 #
-#  COPYRIGHT (c) 1989-2010.
+#  COPYRIGHT (c) 1989-2011.
 #  On-Line Applications Research Corporation (OAR).
 #
 #  The license and distribution terms for this file may be
diff --git a/rtems-test-template/spfatal/testcase.h b/rtems-test-template/spfatal/testcase.h
index 90a03bd..82011af 100644
--- a/rtems-test-template/spfatal/testcase.h
+++ b/rtems-test-template/spfatal/testcase.h
@@ -1,5 +1,5 @@
 /*
- *  COPYRIGHT (c) 1989-2010.
+ *  COPYRIGHT (c) 1989-2011.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
diff --git a/rtems-test-template/sptest/TEST.doc b/rtems-test-template/sptest/TEST.doc
index 5c5378c..8598b00 100644
--- a/rtems-test-template/sptest/TEST.doc
+++ b/rtems-test-template/sptest/TEST.doc
@@ -1,7 +1,7 @@
 #
 #  $Id$
 #
-#  COPYRIGHT (c) 1989-2010.
+#  COPYRIGHT (c) 1989-2011.
 #  On-Line Applications Research Corporation (OAR).
 #
 #  The license and distribution terms for this file may be
diff --git a/rtems-test-template/sptest/init.c b/rtems-test-template/sptest/init.c
index bbe71aa..c85485f 100644
--- a/rtems-test-template/sptest/init.c
+++ b/rtems-test-template/sptest/init.c
@@ -1,5 +1,5 @@
 /*
- *  COPYRIGHT (c) 1989-2010.
+ *  COPYRIGHT (c) 1989-2011.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
diff --git a/rtems-test-template/sptest_operation_from_tsr/TEST.doc b/rtems-test-template/sptest_operation_from_tsr/TEST.doc
index 5c5378c..8598b00 100644
--- a/rtems-test-template/sptest_operation_from_tsr/TEST.doc
+++ b/rtems-test-template/sptest_operation_from_tsr/TEST.doc
@@ -1,7 +1,7 @@
 #
 #  $Id$
 #
-#  COPYRIGHT (c) 1989-2010.
+#  COPYRIGHT (c) 1989-2011.
 #  On-Line Applications Research Corporation (OAR).
 #
 #  The license and distribution terms for this file may be
diff --git a/rtems-test-template/sptest_operation_from_tsr/init.c b/rtems-test-template/sptest_operation_from_tsr/init.c
index 4edbe1b..d6ddb08 100644
--- a/rtems-test-template/sptest_operation_from_tsr/init.c
+++ b/rtems-test-template/sptest_operation_from_tsr/init.c
@@ -1,5 +1,5 @@
 /*
- *  COPYRIGHT (c) 1989-2010.
+ *  COPYRIGHT (c) 1989-2011.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
diff --git a/rtems-test-template/sptest_with_task/TEST.doc b/rtems-test-template/sptest_with_task/TEST.doc
index 5c5378c..8598b00 100644
--- a/rtems-test-template/sptest_with_task/TEST.doc
+++ b/rtems-test-template/sptest_with_task/TEST.doc
@@ -1,7 +1,7 @@
 #
 #  $Id$
 #
-#  COPYRIGHT (c) 1989-2010.
+#  COPYRIGHT (c) 1989-2011.
 #  On-Line Applications Research Corporation (OAR).
 #
 #  The license and distribution terms for this file may be
diff --git a/rtems-test-template/sptest_with_task/init.c b/rtems-test-template/sptest_with_task/init.c
index 10e356b..41a9607 100644
--- a/rtems-test-template/sptest_with_task/init.c
+++ b/rtems-test-template/sptest_with_task/init.c
@@ -1,5 +1,5 @@
 /*
- *  COPYRIGHT (c) 1989-2010.
+ *  COPYRIGHT (c) 1989-2011.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
diff --git a/rtems-test-template/tmtest/TEST.doc b/rtems-test-template/tmtest/TEST.doc
index 1520da7..dc56765 100644
--- a/rtems-test-template/tmtest/TEST.doc
+++ b/rtems-test-template/tmtest/TEST.doc
@@ -1,7 +1,7 @@
 #
 #  $Id$
 #
-#  COPYRIGHT (c) 1989-2010.
+#  COPYRIGHT (c) 1989-2011.
 #  On-Line Applications Research Corporation (OAR).
 #
 #  The license and distribution terms for this file may be
@@ -11,4 +11,4 @@
 
 This test benchmarks the following operations:
 
-+ TBD
++ @DESC@
diff --git a/rtems-test-template/tmtest/init.c b/rtems-test-template/tmtest/init.c
index 764dc75..9cc734a 100644
--- a/rtems-test-template/tmtest/init.c
+++ b/rtems-test-template/tmtest/init.c
@@ -1,5 +1,5 @@
 /*
- *  COPYRIGHT (c) 1989-2010.
+ *  COPYRIGHT (c) 1989-2011.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be