2009-05-14 Joel Sherrill <joel.sherrill@OARcorp.com>

	* Makefile.am, configure.ac, spwatchdog/system.h,
	spwkspace/Makefile.am, spwkspace/init.c: Add shell of test for
	printk. These will help coverage. Simplify spwkspace.
	* spprintk/.cvsignore, spprintk/Makefile.am, spprintk/init.c,
	spprintk/spprintk.scn: New files.
	* spwkspace/system.h: Removed.

10 files changed, 77 insertions, 13 deletions

diff --git a/testsuites/sptests/ChangeLog b/testsuites/sptests/ChangeLog
index 682fd29aa7..6cfcac4bd2 100644
--- a/testsuites/sptests/ChangeLog
+++ b/testsuites/sptests/ChangeLog
@@ -1,3 +1,12 @@
+2009-05-14	Joel Sherrill <joel.sherrill@OARcorp.com>
+
+	* Makefile.am, configure.ac, spwatchdog/system.h,
+	spwkspace/Makefile.am, spwkspace/init.c: Add shell of test for
+	printk. These will help coverage. Simplify spwkspace.
+	* spprintk/.cvsignore, spprintk/Makefile.am, spprintk/init.c,
+	spprintk/spprintk.scn: New files.
+	* spwkspace/system.h: Removed.
+
 2009-05-13	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	* Makefile.am, configure.ac: New test to exercise rtems_workspace_XXX
diff --git a/testsuites/sptests/Makefile.am b/testsuites/sptests/Makefile.am
index c01b6d21d7..e1d94dc6d0 100644
--- a/testsuites/sptests/Makefile.am
+++ b/testsuites/sptests/Makefile.am
@@ -10,7 +10,7 @@ SUBDIRS = sp01 sp02 sp03 sp04 sp05 sp06 sp07 sp08 sp09 sp11 sp12 sp13 sp14 \
     sp30 sp31 sp32 sp33 sp34 sp35 sp37 sp38 sp39 sp40 sp41 sp42 sp43 sp44 \
     sp45 sp46 sp47 sp48 spsize spwatchdog spfatal01 spfatal02 spfatal03 \
     spfatal04 spfatal05 spfatal06 spfatal07 spfatal08 spfatal09 spobjgetnext \
-    spwkspace
+    spprintk spwkspace
  
 DIST_SUBDIRS = $(SUBDIRS) spfatal spfatal_support
 EXTRA_DIST = spfatal_support/init.c spfatal_support/system.h
diff --git a/testsuites/sptests/configure.ac b/testsuites/sptests/configure.ac
index 9e24f8b2bc..036d21f205 100644
--- a/testsuites/sptests/configure.ac
+++ b/testsuites/sptests/configure.ac
@@ -86,6 +86,7 @@ spfatal07/Makefile
 spfatal08/Makefile
 spfatal09/Makefile
 spobjgetnext/Makefile
+spprintk/Makefile
 spwkspace/Makefile
 ])
 AC_OUTPUT
diff --git a/testsuites/sptests/spprintk/.cvsignore b/testsuites/sptests/spprintk/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/testsuites/sptests/spprintk/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/testsuites/sptests/spprintk/Makefile.am b/testsuites/sptests/spprintk/Makefile.am
new file mode 100644
index 0000000000..1d6ac2b1d0
--- /dev/null
+++ b/testsuites/sptests/spprintk/Makefile.am
@@ -0,0 +1,27 @@
+##
+## $Id$
+##
+
+MANAGERS = all
+
+rtems_tests_PROGRAMS = spprintk
+spprintk_SOURCES = init.c
+
+dist_rtems_tests_DATA = spprintk.scn
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
+
+spprintk_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+
+AM_CPPFLAGS += -I$(top_srcdir)/../support/include
+
+LINK_OBJS = $(spprintk_OBJECTS) $(spprintk_LDADD)
+LINK_LIBS = $(spprintk_LDLIBS)
+
+spprintk$(EXEEXT): $(spprintk_OBJECTS) $(spprintk_DEPENDENCIES)
+	@rm -f spprintk$(EXEEXT)
+	$(make-exe)
+
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/spwkspace/system.h b/testsuites/sptests/spprintk/init.c
index e595c3d9dd..382be54d79 100644
--- a/testsuites/sptests/spwkspace/system.h
+++ b/testsuites/sptests/spprintk/init.c
@@ -1,4 +1,6 @@
 /*
+ *  Exercise Printk
+ *
  *  COPYRIGHT (c) 1989-2009.
  *  On-Line Applications Research Corporation (OAR).
  *
@@ -11,21 +13,33 @@
 
 #include <tmacros.h>
 
-/* functions */
-
 rtems_task Init(
   rtems_task_argument argument
-);
+)
+{
+  void                   *p1;
+  bool                    retbool;
+  Heap_Information_block  info;
+
+  puts( "\n\n*** TEST PRINTK ***" );
+
+  printk( "bad format -- %%q in parentheses (%q)\n" );
+
+  printk( "bad format -- %%lq in parentheses (%lq)\n" );
+
+  puts( "*** END OF TEST PRINTK ***" );
+  rtems_test_exit( 0 );
+}
 
 /* configuration information */
 
-#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER
 
+#define CONFIGURE_MAXIMUM_TASKS           1
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
-#define CONFIGURE_MAXIMUM_TASKS             1
+#define CONFIGURE_INIT
 
 #include <rtems/confdefs.h>
 
-/* end of include file */
diff --git a/testsuites/sptests/spprintk/spprintk.scn b/testsuites/sptests/spprintk/spprintk.scn
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/testsuites/sptests/spprintk/spprintk.scn
diff --git a/testsuites/sptests/spwatchdog/system.h b/testsuites/sptests/spwatchdog/system.h
index 8b0a4794c1..c7caff71ad 100644
--- a/testsuites/sptests/spwatchdog/system.h
+++ b/testsuites/sptests/spwatchdog/system.h
@@ -3,7 +3,7 @@
  *  This include file contains information that is included in every
  *  function in the test set.
  *
- *  COPYRIGHT (c) 22.
+ *  COPYRIGHT (c) 1989-2009.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
diff --git a/testsuites/sptests/spwkspace/Makefile.am b/testsuites/sptests/spwkspace/Makefile.am
index 50ab079cd6..cf8bfdc94c 100644
--- a/testsuites/sptests/spwkspace/Makefile.am
+++ b/testsuites/sptests/spwkspace/Makefile.am
@@ -5,7 +5,7 @@
 MANAGERS = all
 
 rtems_tests_PROGRAMS = spwkspace
-spwkspace_SOURCES = init.c system.h
+spwkspace_SOURCES = init.c
 
 dist_rtems_tests_DATA = spwkspace.scn
 
diff --git a/testsuites/sptests/spwkspace/init.c b/testsuites/sptests/spwkspace/init.c
index 0c4028b727..abf4946f54 100644
--- a/testsuites/sptests/spwkspace/init.c
+++ b/testsuites/sptests/spwkspace/init.c
@@ -1,5 +1,5 @@
 /*
- *  Exercise SuperCore Object Get Next
+ *  Exercise Classic API Workspace Wrappers
  *
  *  COPYRIGHT (c) 1989-2009.
  *  On-Line Applications Research Corporation (OAR).
@@ -11,8 +11,8 @@
  *  $Id$
  */
 
-#define CONFIGURE_INIT
-#include "system.h"
+#include <tmacros.h>
+
 
 rtems_task Init(
   rtems_task_argument argument
@@ -57,7 +57,18 @@ rtems_task Init(
   retbool = rtems_workspace_free( p1 ); 
   assert( retbool == true );
 
-
   puts( "*** END OF TEST WORKSPACE CLASSIC API ***" );
   rtems_test_exit( 0 );
 }
+
+/* configuration information */
+
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER
+
+#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
+
+#define CONFIGURE_MAXIMUM_TASKS             1
+
+#define CONFIGURE_INIT
+#include <rtems/confdefs.h>