2009-09-04 Joel Sherrill <joel.sherrill@oarcorp.com>

	* spfatal01/spfatal01.scn, spfatal01/testcase.h,
	spfatal02/spfatal02.scn, spfatal02/testcase.h,
	spfatal03/spfatal03.scn, spfatal03/testcase.h,
	spfatal04/spfatal04.scn, spfatal04/testcase.h,
	spfatal05/spfatal05.scn, spfatal05/testcase.h,
	spfatal06/spfatal06.scn, spfatal06/testcase.h,
	spfatal07/spfatal07.scn, spfatal07/testcase.h,
	spfatal08/spfatal08.scn, spfatal08/testcase.h,
	spfatal09/spfatal09.scn, spfatal09/testcase.h, spfatal10/Makefile.am,
	spfatal10/spfatal10.scn, spfatal11/Makefile.am,
	spfatal11/spfatal11.scn, spfatal12/Makefile.am,
	spfatal12/spfatal12.scn, spfatal_support/init.c: Make all fatal error
	tests use testcase.h and spfatal_support framework. Print test name
	herald in all cases.
	* spfatal10/testcase.h, spfatal11/testcase.h, spfatal12/testcase.h:
	New files.
	* spfatal10/init.c, spfatal11/init.c, spfatal12/init.c: Removed.

32 files changed, 133 insertions, 130 deletions

diff --git a/testsuites/sptests/ChangeLog b/testsuites/sptests/ChangeLog
index b9c2d62796..ca14d79a0f 100644
--- a/testsuites/sptests/ChangeLog
+++ b/testsuites/sptests/ChangeLog
@@ -1,5 +1,25 @@
 2009-09-04	Joel Sherrill <joel.sherrill@oarcorp.com>
 
+	* spfatal01/spfatal01.scn, spfatal01/testcase.h,
+	spfatal02/spfatal02.scn, spfatal02/testcase.h,
+	spfatal03/spfatal03.scn, spfatal03/testcase.h,
+	spfatal04/spfatal04.scn, spfatal04/testcase.h,
+	spfatal05/spfatal05.scn, spfatal05/testcase.h,
+	spfatal06/spfatal06.scn, spfatal06/testcase.h,
+	spfatal07/spfatal07.scn, spfatal07/testcase.h,
+	spfatal08/spfatal08.scn, spfatal08/testcase.h,
+	spfatal09/spfatal09.scn, spfatal09/testcase.h, spfatal10/Makefile.am,
+	spfatal10/spfatal10.scn, spfatal11/Makefile.am,
+	spfatal11/spfatal11.scn, spfatal12/Makefile.am,
+	spfatal12/spfatal12.scn, spfatal_support/init.c: Make all fatal error
+	tests use testcase.h and spfatal_support framework. Print test name
+	herald in all cases.
+	* spfatal10/testcase.h, spfatal11/testcase.h, spfatal12/testcase.h:
+	New files.
+	* spfatal10/init.c, spfatal11/init.c, spfatal12/init.c: Removed.
+
+2009-09-04	Joel Sherrill <joel.sherrill@oarcorp.com>
+
 	* spfatal07/testcase.h: Indicate test is not applicable on some
 	architectures.
 
diff --git a/testsuites/sptests/spfatal01/spfatal01.scn b/testsuites/sptests/spfatal01/spfatal01.scn
index 945a43215b..33ad878e93 100644
--- a/testsuites/sptests/spfatal01/spfatal01.scn
+++ b/testsuites/sptests/spfatal01/spfatal01.scn
@@ -1 +1,2 @@
+*** TEST FATAL 1 ***
 Fatal error (Classic API Init task create failure) hit
diff --git a/testsuites/sptests/spfatal01/testcase.h b/testsuites/sptests/spfatal01/testcase.h
index 2c824fddce..c65243f7a1 100644
--- a/testsuites/sptests/spfatal01/testcase.h
+++ b/testsuites/sptests/spfatal01/testcase.h
@@ -24,6 +24,7 @@ rtems_initialization_tasks_table Initialization_tasks[] = {
 #define CONFIGURE_INIT_TASK_TABLE_SIZE \
   sizeof(CONFIGURE_INIT_TASK_TABLE) / sizeof(rtems_initialization_tasks_table)
 
+#define FATAL_ERROR_TEST_NAME            "1"
 #define FATAL_ERROR_DESCRIPTION          "Classic API Init task create failure"
 #define FATAL_ERROR_EXPECTED_SOURCE      INTERNAL_ERROR_RTEMS_API
 #define FATAL_ERROR_EXPECTED_IS_INTERNAL TRUE
diff --git a/testsuites/sptests/spfatal02/spfatal02.scn b/testsuites/sptests/spfatal02/spfatal02.scn
index 807845b503..3700f68968 100644
--- a/testsuites/sptests/spfatal02/spfatal02.scn
+++ b/testsuites/sptests/spfatal02/spfatal02.scn
@@ -1 +1,2 @@
+*** TEST FATAL 2 ***
 Fatal error (Classic API Init task start failure) hit
diff --git a/testsuites/sptests/spfatal02/testcase.h b/testsuites/sptests/spfatal02/testcase.h
index 81a17499cd..5506354cfc 100644
--- a/testsuites/sptests/spfatal02/testcase.h
+++ b/testsuites/sptests/spfatal02/testcase.h
@@ -24,6 +24,7 @@ rtems_initialization_tasks_table Initialization_tasks[] = {
 #define CONFIGURE_INIT_TASK_TABLE_SIZE \
   sizeof(CONFIGURE_INIT_TASK_TABLE) / sizeof(rtems_initialization_tasks_table)
 
+#define FATAL_ERROR_TEST_NAME            "2"
 #define FATAL_ERROR_DESCRIPTION          "Classic API Init task start failure"
 #define FATAL_ERROR_EXPECTED_SOURCE      INTERNAL_ERROR_RTEMS_API
 #define FATAL_ERROR_EXPECTED_IS_INTERNAL TRUE
diff --git a/testsuites/sptests/spfatal03/spfatal03.scn b/testsuites/sptests/spfatal03/spfatal03.scn
index d110a04df6..d00d5d8d32 100644
--- a/testsuites/sptests/spfatal03/spfatal03.scn
+++ b/testsuites/sptests/spfatal03/spfatal03.scn
@@ -1,2 +1,3 @@
+*** TEST FATAL 3 ***
 Create semaphore S0
 Obtain semaphore in dispatching critical section
diff --git a/testsuites/sptests/spfatal03/testcase.h b/testsuites/sptests/spfatal03/testcase.h
index aaced199c3..dc99b82762 100644
--- a/testsuites/sptests/spfatal03/testcase.h
+++ b/testsuites/sptests/spfatal03/testcase.h
@@ -15,6 +15,7 @@
 
 #define CONFIGURE_MAXIMUM_SEMAPHORES 10
 
+#define FATAL_ERROR_TEST_NAME            "3"
 #define FATAL_ERROR_DESCRIPTION          "Core Mutex obtain in critical section"
 #define FATAL_ERROR_EXPECTED_SOURCE      INTERNAL_ERROR_CORE
 #define FATAL_ERROR_EXPECTED_IS_INTERNAL FALSE
diff --git a/testsuites/sptests/spfatal04/spfatal04.scn b/testsuites/sptests/spfatal04/spfatal04.scn
index 680fcfeb55..5f7daa2fe4 100644
--- a/testsuites/sptests/spfatal04/spfatal04.scn
+++ b/testsuites/sptests/spfatal04/spfatal04.scn
@@ -1 +1,2 @@
+*** TEST FATAL 4 ***
 Fatal error (Classic API call rtems_fatal_error_occurred) hit
diff --git a/testsuites/sptests/spfatal04/testcase.h b/testsuites/sptests/spfatal04/testcase.h
index 960e68e2d2..5b6d8c4816 100644
--- a/testsuites/sptests/spfatal04/testcase.h
+++ b/testsuites/sptests/spfatal04/testcase.h
@@ -24,7 +24,9 @@ rtems_initialization_tasks_table Initialization_tasks[] = {
 #define CONFIGURE_INIT_TASK_TABLE_SIZE \
   sizeof(CONFIGURE_INIT_TASK_TABLE) / sizeof(rtems_initialization_tasks_table)
 
-#define FATAL_ERROR_DESCRIPTION          "Classic API call rtems_fatal_error_occurred"
+#define FATAL_ERROR_TEST_NAME            "4"
+#define FATAL_ERROR_DESCRIPTION \
+        "Classic API call rtems_fatal_error_occurred"
 #define FATAL_ERROR_EXPECTED_SOURCE      INTERNAL_ERROR_RTEMS_API
 #define FATAL_ERROR_EXPECTED_IS_INTERNAL FALSE
 #define FATAL_ERROR_EXPECTED_ERROR       0xdead
diff --git a/testsuites/sptests/spfatal05/spfatal05.scn b/testsuites/sptests/spfatal05/spfatal05.scn
index c37c779a86..bc0bbc88aa 100644
--- a/testsuites/sptests/spfatal05/spfatal05.scn
+++ b/testsuites/sptests/spfatal05/spfatal05.scn
@@ -1 +1,2 @@
+*** TEST FATAL 5 ***
 Fatal error (Core fall out of a task) hit
diff --git a/testsuites/sptests/spfatal05/testcase.h b/testsuites/sptests/spfatal05/testcase.h
index 3fca0921d6..ae01d9ac24 100644
--- a/testsuites/sptests/spfatal05/testcase.h
+++ b/testsuites/sptests/spfatal05/testcase.h
@@ -33,6 +33,7 @@ rtems_initialization_tasks_table Initialization_tasks[] = {
 
 #define SPFATAL_TEST_CASE_EXTRA_TASKS 1
 
+#define FATAL_ERROR_TEST_NAME            "5"
 #define FATAL_ERROR_DESCRIPTION          "Core fall out of a task"
 #define FATAL_ERROR_EXPECTED_SOURCE      INTERNAL_ERROR_CORE
 #define FATAL_ERROR_EXPECTED_IS_INTERNAL TRUE
diff --git a/testsuites/sptests/spfatal06/spfatal06.scn b/testsuites/sptests/spfatal06/spfatal06.scn
index 31c65088b7..56fbbb2125 100644
--- a/testsuites/sptests/spfatal06/spfatal06.scn
+++ b/testsuites/sptests/spfatal06/spfatal06.scn
@@ -1 +1,2 @@
+*** TEST FATAL 6 ***
 Fatal error (Core initialize with invalid stack hook) hit
diff --git a/testsuites/sptests/spfatal06/testcase.h b/testsuites/sptests/spfatal06/testcase.h
index d17f7792ce..36d3173def 100644
--- a/testsuites/sptests/spfatal06/testcase.h
+++ b/testsuites/sptests/spfatal06/testcase.h
@@ -31,14 +31,16 @@ rtems_initialization_tasks_table Initialization_tasks[] = {
 #define CONFIGURE_INIT_TASK_TABLE_SIZE \
   sizeof(CONFIGURE_INIT_TASK_TABLE) / sizeof(rtems_initialization_tasks_table)
 
-#define FATAL_ERROR_DESCRIPTION          "Core initialize with invalid stack hook"
+#define FATAL_ERROR_TEST_NAME            "6"
+#define FATAL_ERROR_DESCRIPTION \
+        "Core initialize with invalid stack hook"
 #define FATAL_ERROR_EXPECTED_SOURCE      INTERNAL_ERROR_CORE
 #define FATAL_ERROR_EXPECTED_IS_INTERNAL TRUE
 #define FATAL_ERROR_EXPECTED_ERROR       INTERNAL_ERROR_BAD_STACK_HOOK
 
-void *New_stack_allocate_hook(uint32_t unused);
+void *New_stack_allocate_hook(size_t unused);
 
-void *New_stack_allocate_hook(uint32_t unused)
+void *New_stack_allocate_hook(size_t unused)
 {
 }
 
@@ -47,7 +49,7 @@ void force_error()
   if (Configuration.stack_free_hook != NULL)
     Configuration.stack_allocate_hook = NULL;
   else
-    Configuration.stack_allocate_hook = &New_stack_allocate_hook;
+    Configuration.stack_allocate_hook = New_stack_allocate_hook;
 
   rtems_initialize_data_structures();
   /* we will not run this far */
diff --git a/testsuites/sptests/spfatal07/spfatal07.scn b/testsuites/sptests/spfatal07/spfatal07.scn
index a91802eaf7..8c21d25d12 100644
--- a/testsuites/sptests/spfatal07/spfatal07.scn
+++ b/testsuites/sptests/spfatal07/spfatal07.scn
@@ -1 +1,2 @@
+*** TEST FATAL 7 ***
 Fatal error (Core Configuration Invalid ISR stack size) hit
diff --git a/testsuites/sptests/spfatal07/testcase.h b/testsuites/sptests/spfatal07/testcase.h
index 34a7683611..86c465ee0d 100644
--- a/testsuites/sptests/spfatal07/testcase.h
+++ b/testsuites/sptests/spfatal07/testcase.h
@@ -31,7 +31,9 @@ rtems_initialization_tasks_table Initialization_tasks[] = {
 #define CONFIGURE_INIT_TASK_TABLE_SIZE \
   sizeof(CONFIGURE_INIT_TASK_TABLE) / sizeof(rtems_initialization_tasks_table)
 
-#define FATAL_ERROR_DESCRIPTION          "Core Configuration Invalid ISR stack size"
+#define FATAL_ERROR_TEST_NAME            "7"
+#define FATAL_ERROR_DESCRIPTION \
+        "Core Configuration Invalid ISR stack size"
 #define FATAL_ERROR_EXPECTED_SOURCE      INTERNAL_ERROR_CORE
 #define FATAL_ERROR_EXPECTED_IS_INTERNAL TRUE
 #define FATAL_ERROR_EXPECTED_ERROR       INTERNAL_ERROR_INTERRUPT_STACK_TOO_SMALL
diff --git a/testsuites/sptests/spfatal08/spfatal08.scn b/testsuites/sptests/spfatal08/spfatal08.scn
index af9082b11b..d687fabda0 100644
--- a/testsuites/sptests/spfatal08/spfatal08.scn
+++ b/testsuites/sptests/spfatal08/spfatal08.scn
@@ -1 +1,2 @@
+*** TEST FATAL 8 ***
 Fatal error (Core workspace too small) hit
diff --git a/testsuites/sptests/spfatal08/testcase.h b/testsuites/sptests/spfatal08/testcase.h
index 77432026fe..ef49f5cee1 100644
--- a/testsuites/sptests/spfatal08/testcase.h
+++ b/testsuites/sptests/spfatal08/testcase.h
@@ -31,6 +31,7 @@ rtems_initialization_tasks_table Initialization_tasks[] = {
 #define CONFIGURE_INIT_TASK_TABLE_SIZE \
   sizeof(CONFIGURE_INIT_TASK_TABLE) / sizeof(rtems_initialization_tasks_table)
 
+#define FATAL_ERROR_TEST_NAME            "8"
 #define FATAL_ERROR_DESCRIPTION          "Core workspace too small"
 #define FATAL_ERROR_EXPECTED_SOURCE      INTERNAL_ERROR_CORE
 #define FATAL_ERROR_EXPECTED_IS_INTERNAL TRUE 
diff --git a/testsuites/sptests/spfatal09/spfatal09.scn b/testsuites/sptests/spfatal09/spfatal09.scn
index 458254012e..06974a108d 100644
--- a/testsuites/sptests/spfatal09/spfatal09.scn
+++ b/testsuites/sptests/spfatal09/spfatal09.scn
@@ -1 +1,2 @@
+*** TEST FATAL 9 ***
 Fatal error (Core invalid workspace address) hit
diff --git a/testsuites/sptests/spfatal09/testcase.h b/testsuites/sptests/spfatal09/testcase.h
index ab8cd1aaae..01dedcac5e 100644
--- a/testsuites/sptests/spfatal09/testcase.h
+++ b/testsuites/sptests/spfatal09/testcase.h
@@ -31,6 +31,7 @@ rtems_initialization_tasks_table Initialization_tasks[] = {
 #define CONFIGURE_INIT_TASK_TABLE_SIZE \
   sizeof(CONFIGURE_INIT_TASK_TABLE) / sizeof(rtems_initialization_tasks_table)
 
+#define FATAL_ERROR_TEST_NAME            "9"
 #define FATAL_ERROR_DESCRIPTION          "Core invalid workspace address"
 #define FATAL_ERROR_EXPECTED_SOURCE      INTERNAL_ERROR_CORE 
 #define FATAL_ERROR_EXPECTED_IS_INTERNAL TRUE
diff --git a/testsuites/sptests/spfatal10/Makefile.am b/testsuites/sptests/spfatal10/Makefile.am
index 04cb312649..d93b6a6019 100644
--- a/testsuites/sptests/spfatal10/Makefile.am
+++ b/testsuites/sptests/spfatal10/Makefile.am
@@ -5,7 +5,8 @@
 MANAGERS = all
 
 rtems_tests_PROGRAMS = spfatal10
-spfatal10_SOURCES = init.c
+spfatal10_SOURCES = ../spfatal_support/init.c ../spfatal_support/system.h \
+    testcase.h
 
 dist_rtems_tests_DATA = spfatal10.scn
 dist_rtems_tests_DATA += spfatal10.doc
diff --git a/testsuites/sptests/spfatal10/init.c b/testsuites/sptests/spfatal10/init.c
deleted file mode 100644
index a038468361..0000000000
--- a/testsuites/sptests/spfatal10/init.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*  Test __assert with function name
- *
- *  COPYRIGHT (c) 1989-2009.
- *  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$
- */
-
-#include <tmacros.h>
-#undef NDEBUG
-#include <assert.h>
-
-rtems_task Init(
-  rtems_task_argument ignored
-)
-{
-  puts( "\n\n*** TEST FATAL 10 ***" );
-
-  puts( "asserting with non-NULL strings...\n" );
-  __assert_func( __FILE__, __LINE__, "Init", "forced" );
-
-}
-
-/* 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_INIT
-#include <rtems/confdefs.h>
-
-/* global variables */
diff --git a/testsuites/sptests/spfatal10/spfatal10.scn b/testsuites/sptests/spfatal10/spfatal10.scn
index 77113c76b5..b613722f3e 100644
--- a/testsuites/sptests/spfatal10/spfatal10.scn
+++ b/testsuites/sptests/spfatal10/spfatal10.scn
@@ -1,5 +1,3 @@
 *** TEST FATAL 10 ***
-asserting with non-NULL strings...
-
-assertion "force" failed: file "../../../../../../../rtems/c/src/../../testsuites/sptests/spfatal10/init.c", line 24, function: Init
-program stopped with signal 2.
+assertion "forced" failed: file "../../../../../../../rtems/c/src/../../testsuites/sptests/spfatal10/testcase.h", line 20, function: Init
+Fatal error (asserting with non-NULL strings...) hit
diff --git a/testsuites/sptests/spfatal10/testcase.h b/testsuites/sptests/spfatal10/testcase.h
new file mode 100644
index 0000000000..7d80bc638e
--- /dev/null
+++ b/testsuites/sptests/spfatal10/testcase.h
@@ -0,0 +1,24 @@
+/*  Test __assert_func with NULL function name
+ *
+ *  COPYRIGHT (c) 1989-2009.
+ *  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$
+ */
+
+#define FATAL_ERROR_TEST_NAME            "10"
+#define FATAL_ERROR_DESCRIPTION          "asserting with non-NULL strings..."
+#define FATAL_ERROR_EXPECTED_SOURCE      INTERNAL_ERROR_RTEMS_API
+#define FATAL_ERROR_EXPECTED_IS_INTERNAL FALSE
+#define FATAL_ERROR_EXPECTED_ERROR       0
+
+void force_error()
+{
+  __assert_func( __FILE__, __LINE__, "Init", "forced" );
+   
+  /* we will not run this far */
+}
diff --git a/testsuites/sptests/spfatal11/Makefile.am b/testsuites/sptests/spfatal11/Makefile.am
index 22e012f2bd..c9d3ad5a9d 100644
--- a/testsuites/sptests/spfatal11/Makefile.am
+++ b/testsuites/sptests/spfatal11/Makefile.am
@@ -5,7 +5,8 @@
 MANAGERS = all
 
 rtems_tests_PROGRAMS = spfatal11
-spfatal11_SOURCES = init.c
+spfatal11_SOURCES = ../spfatal_support/init.c ../spfatal_support/system.h \
+    testcase.h
 
 dist_rtems_tests_DATA = spfatal11.scn
 dist_rtems_tests_DATA += spfatal11.doc
diff --git a/testsuites/sptests/spfatal11/init.c b/testsuites/sptests/spfatal11/init.c
deleted file mode 100644
index b7ba85b5f5..0000000000
--- a/testsuites/sptests/spfatal11/init.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*  Test __assert_func with NULL function name
- *
- *  COPYRIGHT (c) 1989-2009.
- *  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$
- */
-
-#include <tmacros.h>
-#undef NDEBUG
-#include <assert.h>
-
-rtems_task Init(
-  rtems_task_argument ignored
-)
-{
-  puts( "\n\n*** TEST FATAL 11 ***" );
-
-  puts( "asserting with non-NULL strings..." );
-  __assert_func( __FILE__, __LINE__, NULL, "forced" );
-}
-
-/* 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_INIT
-#include <rtems/confdefs.h>
-
-/* global variables */
diff --git a/testsuites/sptests/spfatal11/spfatal11.scn b/testsuites/sptests/spfatal11/spfatal11.scn
index 4e8a76f809..ac067533cd 100644
--- a/testsuites/sptests/spfatal11/spfatal11.scn
+++ b/testsuites/sptests/spfatal11/spfatal11.scn
@@ -1,5 +1,5 @@
 *** TEST FATAL 11 ***
 asserting with non-NULL strings...
+assertion "forced" failed: file "../../../../../../../rtems/c/src/../../testsuites/sptests/spfatal11/testcase.h", line 21
+Fatal error (asserting with non-NULL strings...) hit
 
-assertion "forced" failed: file "../../../../../../../rtems/c/src/../../testsuites/sptests/spfatal11/init.c", line 24
-program stopped with signal 2.
diff --git a/testsuites/sptests/spfatal11/testcase.h b/testsuites/sptests/spfatal11/testcase.h
new file mode 100644
index 0000000000..60ebe481a4
--- /dev/null
+++ b/testsuites/sptests/spfatal11/testcase.h
@@ -0,0 +1,24 @@
+/*  Test __assert_func with NULL function name
+ *
+ *  COPYRIGHT (c) 1989-2009.
+ *  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$
+ */
+
+#define FATAL_ERROR_TEST_NAME            "11"
+#define FATAL_ERROR_DESCRIPTION          "asserting with non-NULL strings..."
+#define FATAL_ERROR_EXPECTED_SOURCE      INTERNAL_ERROR_RTEMS_API
+#define FATAL_ERROR_EXPECTED_IS_INTERNAL FALSE
+#define FATAL_ERROR_EXPECTED_ERROR       0
+
+void force_error()
+{
+  __assert_func( __FILE__, __LINE__, NULL, "forced" );
+   
+  /* we will not run this far */
+}
diff --git a/testsuites/sptests/spfatal12/Makefile.am b/testsuites/sptests/spfatal12/Makefile.am
index 7742b0e17d..2301e1cc78 100644
--- a/testsuites/sptests/spfatal12/Makefile.am
+++ b/testsuites/sptests/spfatal12/Makefile.am
@@ -5,7 +5,8 @@
 MANAGERS = all
 
 rtems_tests_PROGRAMS = spfatal12
-spfatal12_SOURCES = init.c
+spfatal12_SOURCES = ../spfatal_support/init.c ../spfatal_support/system.h \
+    testcase.h
 
 dist_rtems_tests_DATA = spfatal12.scn
 dist_rtems_tests_DATA += spfatal12.doc
diff --git a/testsuites/sptests/spfatal12/init.c b/testsuites/sptests/spfatal12/init.c
deleted file mode 100644
index b093b540cb..0000000000
--- a/testsuites/sptests/spfatal12/init.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*  Test fatal error when _Heap_Initialize fails during initialization
- *
- *  COPYRIGHT (c) 1989-2009.
- *  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$
- */
-
-#include <tmacros.h>
-
-rtems_task Init(
-  rtems_task_argument ignored
-)
-{
-  puts( "\n\n*** TEST FATAL 12 ***" );
-
-  puts( "_Heap_Initialize fails during RTEMS initialization" );
-  Configuration.work_space_size  = sizeof(void *);
-  rtems_initialize_data_structures();
-}
-
-/* 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_INIT
-#include <rtems/confdefs.h>
-
-/* global variables */
diff --git a/testsuites/sptests/spfatal12/spfatal12.scn b/testsuites/sptests/spfatal12/spfatal12.scn
index 2bb7d06c31..f96b503104 100644
--- a/testsuites/sptests/spfatal12/spfatal12.scn
+++ b/testsuites/sptests/spfatal12/spfatal12.scn
@@ -1,2 +1,2 @@
 *** TEST FATAL 12 ***
-_Heap_Initialize fails during RTEMS initialization
+Fatal error (_Heap_Initialize fails during RTEMS initialization) hit
diff --git a/testsuites/sptests/spfatal12/testcase.h b/testsuites/sptests/spfatal12/testcase.h
new file mode 100644
index 0000000000..4af72e3bcf
--- /dev/null
+++ b/testsuites/sptests/spfatal12/testcase.h
@@ -0,0 +1,26 @@
+/*  Test __assert_func with NULL function name
+ *
+ *  COPYRIGHT (c) 1989-2009.
+ *  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$
+ */
+
+#define FATAL_ERROR_TEST_NAME            "12"
+#define FATAL_ERROR_DESCRIPTION  \
+        "_Heap_Initialize fails during RTEMS initialization"
+#define FATAL_ERROR_EXPECTED_SOURCE      INTERNAL_ERROR_CORE
+#define FATAL_ERROR_EXPECTED_IS_INTERNAL TRUE
+#define FATAL_ERROR_EXPECTED_ERROR       INTERNAL_ERROR_TOO_LITTLE_WORKSPACE
+
+void force_error()
+{
+  Configuration.work_space_size  = sizeof(void *);
+  rtems_initialize_data_structures();
+
+  /* we will not run this far */
+}
diff --git a/testsuites/sptests/spfatal_support/init.c b/testsuites/sptests/spfatal_support/init.c
index 84bade2691..7694c7d6ab 100644
--- a/testsuites/sptests/spfatal_support/init.c
+++ b/testsuites/sptests/spfatal_support/init.c
@@ -28,6 +28,7 @@ rtems_task Init(
   rtems_task_argument argument
 )
 {
+  printk( "\n\n\n*** TEST FATAL " FATAL_ERROR_TEST_NAME " ***\n" );
   force_error();
   printk( "Fatal error (%s) NOT hit\n", FATAL_ERROR_DESCRIPTION );
   rtems_test_exit(0);