2010-06-08 Jennifer Averett <Jennifer.Averett@OARcorp.com>

	* spfifo01/Makefile.am, spfifo02/Makefile.am, spfifo03/Makefile.am,
	spfifo04/Makefile.am: Merged fifo main and test files into the
	standard init file. Fixed copyright information.
	* spfifo01/init.c, spfifo02/init.c, spfifo03/init.c, spfifo04/init.c:
	New files.
	* spfifo01/main.c, spfifo01/test.c, spfifo02/main.c, spfifo02/test.c,
	spfifo03/main.c, spfifo03/test.c, spfifo04/main.c, spfifo04/test.c:
	Removed.

3 files changed, 29 insertions, 62 deletions

diff --git a/testsuites/sptests/spfifo02/Makefile.am b/testsuites/sptests/spfifo02/Makefile.am
index 4d14361bc2..fa1e55a4ab 100644
--- a/testsuites/sptests/spfifo02/Makefile.am
+++ b/testsuites/sptests/spfifo02/Makefile.am
@@ -5,7 +5,7 @@
 MANAGERS = all
 
 rtems_tests_PROGRAMS = spfifo02
-spfifo02_SOURCES = main.c test.c
+spfifo02_SOURCES = init.c
 
 dist_rtems_tests_DATA = spfifo02.scn
 dist_rtems_tests_DATA += spfifo02.doc
diff --git a/testsuites/sptests/spfifo02/test.c b/testsuites/sptests/spfifo02/init.c
index 8cb6cec29d..0fb6ebb380 100644
--- a/testsuites/sptests/spfifo02/test.c
+++ b/testsuites/sptests/spfifo02/init.c
@@ -1,13 +1,5 @@
-/*  test_main
- *
- *  This routine serves as a test routine.
- *  Exercises the fifo_open
- *
- *  Input parameters:   NONE
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1999.
+/*
+ *  COPYRIGHT (c) 1989-2010.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -18,7 +10,10 @@
  */
 
 /* Includes */
+#include <bsp.h>
+#include <tmacros.h>
 
+/* Includes */
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -26,7 +21,6 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include <tmacros.h>
 #include <rtems.h>
 #include <rtems/libio.h>
 
@@ -73,3 +67,26 @@ were acquired"
   puts("\n\n*** END OF FIFO / PIPE OPEN TEST - 2 ***");
 }
   
+rtems_task Init(
+  rtems_task_argument not_used
+)
+{
+  test_main();
+  rtems_test_exit(0);
+}
+
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+
+#define CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM
+#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 6
+
+#define CONFIGURE_MAXIMUM_TASKS 1
+
+#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
+#define CONFIGURE_PIPES_ENABLED
+#define CONFIGURE_INIT
+
+#include <rtems/confdefs.h>
+
+/* end of file */
diff --git a/testsuites/sptests/spfifo02/main.c b/testsuites/sptests/spfifo02/main.c
deleted file mode 100644
index 2ffacaf41f..0000000000
--- a/testsuites/sptests/spfifo02/main.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*  Init
- *
- *  This routine is the initialization task for this test program.
- *  It is a user initialization task and has the responsibility
- *  of invoking the test routine
- *
- *  Input parameters:
- *    not_used
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1999.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.com/license/LICENSE.
- *
- *  $Id$
- */
-
-/* Includes */
-#include <bsp.h>
-#include <tmacros.h>
-
-void test_main(void);
-
-rtems_task Init(
-  rtems_task_argument not_used
-)
-{
-  test_main();
-  rtems_test_exit(0);
-}
-
-#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM
-#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 6
-
-#define CONFIGURE_MAXIMUM_TASKS 1
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-#define CONFIGURE_PIPES_ENABLED
-#define CONFIGURE_INIT
-
-#include <rtems/confdefs.h>
-
-/* end of file */