2011-08-22 Sebastian Huber <sebastian.huber@embedded-brains.de>

	* spfatal13/testcase.h: Fixed test name.
	* spfatal05/testcase.h: Increased wait time for slow hardware.
	* spfatal_support/init.c: Print test name at end of test.
	* spfatal01/spfatal01.scn, spfatal02/spfatal02.scn,
	spfatal03/spfatal03.scn, spfatal04/spfatal04.scn,
	spfatal05/spfatal05.scn, spfatal06/spfatal06.scn,
	spfatal07/spfatal07.scn, spfatal08/spfatal08.scn,
	spfatal09/spfatal09.scn, spfatal10/spfatal10.scn,
	spfatal11/spfatal11.scn, spfatal12/spfatal12.scn,
	spfatal13/spfatal13.scn, spfatal14/spfatal14.scn,
	spfatal15/spfatal15.scn, spfatal16/spfatal16.scn,
	spfatal17/spfatal17.scn, spfatal18/spfatal18.scn,
	spfatal19/spfatal19.scn, spfatal20/spfatal20.scn,
	spfatal21/spfatal21.scn, spfatal22/spfatal22.scn,
	spfatal23/spfatal23.scn, spfatal24/spfatal24.scn,
	spfatal25/spfatal25.scn: Reflect changes from above.

29 files changed, 47 insertions, 28 deletions

diff --git a/testsuites/sptests/ChangeLog b/testsuites/sptests/ChangeLog
index 263e5b3dbd..dfdb694ab5 100644
--- a/testsuites/sptests/ChangeLog
+++ b/testsuites/sptests/ChangeLog
@@ -1,5 +1,24 @@
 2011-08-22	Sebastian Huber <sebastian.huber@embedded-brains.de>
 
+	* spfatal13/testcase.h: Fixed test name.
+	* spfatal05/testcase.h: Increased wait time for slow hardware.
+	* spfatal_support/init.c: Print test name at end of test.
+	* spfatal01/spfatal01.scn, spfatal02/spfatal02.scn,
+	spfatal03/spfatal03.scn, spfatal04/spfatal04.scn,
+	spfatal05/spfatal05.scn, spfatal06/spfatal06.scn,
+	spfatal07/spfatal07.scn, spfatal08/spfatal08.scn,
+	spfatal09/spfatal09.scn, spfatal10/spfatal10.scn,
+	spfatal11/spfatal11.scn, spfatal12/spfatal12.scn,
+	spfatal13/spfatal13.scn, spfatal14/spfatal14.scn,
+	spfatal15/spfatal15.scn, spfatal16/spfatal16.scn,
+	spfatal17/spfatal17.scn, spfatal18/spfatal18.scn,
+	spfatal19/spfatal19.scn, spfatal20/spfatal20.scn,
+	spfatal21/spfatal21.scn, spfatal22/spfatal22.scn,
+	spfatal23/spfatal23.scn, spfatal24/spfatal24.scn,
+	spfatal25/spfatal25.scn: Reflect changes from above.
+
+2011-08-22	Sebastian Huber <sebastian.huber@embedded-brains.de>
+
 	PR 1899/testing
 	* spfatal14/Makefile.am: Adjust number of semaphores to consume to
 	trigger fatal error.
diff --git a/testsuites/sptests/spfatal01/spfatal01.scn b/testsuites/sptests/spfatal01/spfatal01.scn
index d3f2c1efc9..7cfaaafba9 100644
--- a/testsuites/sptests/spfatal01/spfatal01.scn
+++ b/testsuites/sptests/spfatal01/spfatal01.scn
@@ -1,2 +1,2 @@
 Fatal error (Classic API Init task create failure) hit
-*** END OF TEST ***
+*** END OF TEST FATAL 1 ***
diff --git a/testsuites/sptests/spfatal02/spfatal02.scn b/testsuites/sptests/spfatal02/spfatal02.scn
index c4ad326e72..5d1c667025 100644
--- a/testsuites/sptests/spfatal02/spfatal02.scn
+++ b/testsuites/sptests/spfatal02/spfatal02.scn
@@ -1,2 +1,2 @@
 Fatal error (Classic API Init task start failure) hit
-*** END OF TEST ***
+*** END OF TEST FATAL 2 ***
diff --git a/testsuites/sptests/spfatal03/spfatal03.scn b/testsuites/sptests/spfatal03/spfatal03.scn
index 10ca3c07a0..3c80698cf8 100644
--- a/testsuites/sptests/spfatal03/spfatal03.scn
+++ b/testsuites/sptests/spfatal03/spfatal03.scn
@@ -2,4 +2,4 @@
 Create semaphore S0
 Obtain semaphore in dispatching critical section
 Fatal error (Core Mutex obtain in critical section) hit
-*** END OF TEST ***
+*** END OF TEST FATAL 3 ***
diff --git a/testsuites/sptests/spfatal04/spfatal04.scn b/testsuites/sptests/spfatal04/spfatal04.scn
index 1146aaece6..0057ad331e 100644
--- a/testsuites/sptests/spfatal04/spfatal04.scn
+++ b/testsuites/sptests/spfatal04/spfatal04.scn
@@ -1,3 +1,3 @@
 *** TEST FATAL 4 ***
 Fatal error (Classic API call rtems_fatal_error_occurred) hit
-*** END OF TEST ***
+*** END OF TEST FATAL 4 ***
diff --git a/testsuites/sptests/spfatal05/spfatal05.scn b/testsuites/sptests/spfatal05/spfatal05.scn
index da6d123fc0..8eb4652873 100644
--- a/testsuites/sptests/spfatal05/spfatal05.scn
+++ b/testsuites/sptests/spfatal05/spfatal05.scn
@@ -1,3 +1,3 @@
 *** TEST FATAL 5 ***
 Fatal error (Core fall out of a task) hit
-*** END OF TEST ***
+*** END OF TEST FATAL 5 ***
diff --git a/testsuites/sptests/spfatal05/testcase.h b/testsuites/sptests/spfatal05/testcase.h
index 1fa9d6b101..8e054ae410 100644
--- a/testsuites/sptests/spfatal05/testcase.h
+++ b/testsuites/sptests/spfatal05/testcase.h
@@ -65,7 +65,7 @@ void force_error()
   status = rtems_task_start( id, EmptyTask, 0 );
   directive_failed( status, "rtems_task_start" );
 
-  status = rtems_task_wake_after( 10 );
+  status = rtems_task_wake_after( 100 );
   directive_failed( status, "rtems_task_wake_after" );
 
   /* we will not run this far */
diff --git a/testsuites/sptests/spfatal06/spfatal06.scn b/testsuites/sptests/spfatal06/spfatal06.scn
index c1cd75ee65..69d3d52fd4 100644
--- a/testsuites/sptests/spfatal06/spfatal06.scn
+++ b/testsuites/sptests/spfatal06/spfatal06.scn
@@ -1,3 +1,3 @@
 *** TEST FATAL 6 ***
 Fatal error (Core initialize with invalid stack hook) hit
-*** END OF TEST ***
+*** END OF TEST FATAL 6 ***
diff --git a/testsuites/sptests/spfatal07/spfatal07.scn b/testsuites/sptests/spfatal07/spfatal07.scn
index 5cabb76587..5d7e820d60 100644
--- a/testsuites/sptests/spfatal07/spfatal07.scn
+++ b/testsuites/sptests/spfatal07/spfatal07.scn
@@ -1,3 +1,3 @@
 *** TEST FATAL 7 ***
 Fatal error (Core Configuration Invalid ISR stack size) hit
-*** END OF TEST ***
+*** END OF TEST FATAL 7 ***
diff --git a/testsuites/sptests/spfatal08/spfatal08.scn b/testsuites/sptests/spfatal08/spfatal08.scn
index a584984b49..b06e671f5a 100644
--- a/testsuites/sptests/spfatal08/spfatal08.scn
+++ b/testsuites/sptests/spfatal08/spfatal08.scn
@@ -1,3 +1,3 @@
 *** TEST FATAL 8 ***
 Fatal error (Core workspace too small) hit
-*** END OF TEST ***
+*** END OF TEST FATAL 8 ***
diff --git a/testsuites/sptests/spfatal09/spfatal09.scn b/testsuites/sptests/spfatal09/spfatal09.scn
index 4ab109adc3..f1a0c75dec 100644
--- a/testsuites/sptests/spfatal09/spfatal09.scn
+++ b/testsuites/sptests/spfatal09/spfatal09.scn
@@ -1,4 +1,4 @@
 *** TEST FATAL 9 ***
 Fatal error (Bad heap address to malloc) hit
-*** END OF TEST ***
+*** END OF TEST FATAL 9 ***
 
diff --git a/testsuites/sptests/spfatal10/spfatal10.scn b/testsuites/sptests/spfatal10/spfatal10.scn
index 9c63bd70ae..3f348ef386 100644
--- a/testsuites/sptests/spfatal10/spfatal10.scn
+++ b/testsuites/sptests/spfatal10/spfatal10.scn
@@ -1,4 +1,4 @@
 *** TEST FATAL 10 ***
 assertion "forced" failed: file "testsuites/sptests/spfatal10/testcase.h", line 23, function: Init
 Fatal error (asserting with non-NULL strings...) hit
-*** END OF TEST ***
+*** END OF TEST FATAL 10 ***
diff --git a/testsuites/sptests/spfatal11/spfatal11.scn b/testsuites/sptests/spfatal11/spfatal11.scn
index 90f399cdab..3980d82cd7 100644
--- a/testsuites/sptests/spfatal11/spfatal11.scn
+++ b/testsuites/sptests/spfatal11/spfatal11.scn
@@ -1,4 +1,4 @@
 *** TEST FATAL 11 ***
 assertion "forced" failed: file "testsuites/sptests/spfatal11/testcase.h", line 23
 Fatal error (asserting with non-NULL strings...) hit
-*** END OF TEST ***
+*** END OF TEST FATAL 11 ***
diff --git a/testsuites/sptests/spfatal12/spfatal12.scn b/testsuites/sptests/spfatal12/spfatal12.scn
index a5cfe0cada..cde48c9fba 100644
--- a/testsuites/sptests/spfatal12/spfatal12.scn
+++ b/testsuites/sptests/spfatal12/spfatal12.scn
@@ -1,3 +1,3 @@
 *** TEST FATAL 12 ***
 Fatal error (_Heap_Initialize fails during RTEMS initialization) hit
-*** END OF TEST ***
+*** END OF TEST FATAL 12 ***
diff --git a/testsuites/sptests/spfatal13/spfatal13.scn b/testsuites/sptests/spfatal13/spfatal13.scn
index 80dc0d3c2e..952f9b4b53 100644
--- a/testsuites/sptests/spfatal13/spfatal13.scn
+++ b/testsuites/sptests/spfatal13/spfatal13.scn
@@ -1,2 +1,2 @@
 Fatal error (Configuration of unlimited and maximum of 0) hit
-*** END OF TEST ***
+*** END OF TEST FATAL 13 ***
diff --git a/testsuites/sptests/spfatal13/testcase.h b/testsuites/sptests/spfatal13/testcase.h
index d5dab19366..7abe4fb79a 100644
--- a/testsuites/sptests/spfatal13/testcase.h
+++ b/testsuites/sptests/spfatal13/testcase.h
@@ -10,7 +10,7 @@
  *  $Id$
  */
 
-#define FATAL_ERROR_TEST_NAME            "12"
+#define FATAL_ERROR_TEST_NAME            "13"
 #define FATAL_ERROR_DESCRIPTION  \
         "Configuration of unlimited and maximum of 0"
 #define FATAL_ERROR_EXPECTED_SOURCE      INTERNAL_ERROR_CORE
diff --git a/testsuites/sptests/spfatal14/spfatal14.scn b/testsuites/sptests/spfatal14/spfatal14.scn
index f1704fac0b..42a0d41684 100644
--- a/testsuites/sptests/spfatal14/spfatal14.scn
+++ b/testsuites/sptests/spfatal14/spfatal14.scn
@@ -1,2 +1,2 @@
 Fatal error (fail to open stdout) hit
-*** END OF TEST ***
+*** END OF TEST FATAL 14 ***
diff --git a/testsuites/sptests/spfatal15/spfatal15.scn b/testsuites/sptests/spfatal15/spfatal15.scn
index 7a016a35f0..4fe4c7ca32 100644
--- a/testsuites/sptests/spfatal15/spfatal15.scn
+++ b/testsuites/sptests/spfatal15/spfatal15.scn
@@ -1,2 +1,2 @@
 Fatal error (fail to open stderr) hit
-*** END OF TEST ***
+*** END OF TEST FATAL 15 ***
diff --git a/testsuites/sptests/spfatal16/spfatal16.scn b/testsuites/sptests/spfatal16/spfatal16.scn
index ccf6ef8b1c..78d7507da0 100644
--- a/testsuites/sptests/spfatal16/spfatal16.scn
+++ b/testsuites/sptests/spfatal16/spfatal16.scn
@@ -1,2 +1,2 @@
 Fatal error (termios sem create #1) hit
-*** END OF TEST ***
+*** END OF TEST FATAL 16 ***
diff --git a/testsuites/sptests/spfatal17/spfatal17.scn b/testsuites/sptests/spfatal17/spfatal17.scn
index fa83ca3500..78c653d809 100644
--- a/testsuites/sptests/spfatal17/spfatal17.scn
+++ b/testsuites/sptests/spfatal17/spfatal17.scn
@@ -1,2 +1,2 @@
 Fatal error (termios sem create #2) hit
-*** END OF TEST ***
+*** END OF TEST FATAL 17 ***
diff --git a/testsuites/sptests/spfatal18/spfatal18.scn b/testsuites/sptests/spfatal18/spfatal18.scn
index 752017e565..9d541fcbf5 100644
--- a/testsuites/sptests/spfatal18/spfatal18.scn
+++ b/testsuites/sptests/spfatal18/spfatal18.scn
@@ -1,2 +1,2 @@
 Fatal error (termios sem create #3) hit
-*** END OF TEST ***
+*** END OF TEST FATAL 18 ***
diff --git a/testsuites/sptests/spfatal19/spfatal19.scn b/testsuites/sptests/spfatal19/spfatal19.scn
index 85a72ac530..e520faf614 100644
--- a/testsuites/sptests/spfatal19/spfatal19.scn
+++ b/testsuites/sptests/spfatal19/spfatal19.scn
@@ -1,2 +1,2 @@
 Fatal error (termios sem create #4) hit
-*** END OF TEST ***
+*** END OF TEST FATAL 19 ***
diff --git a/testsuites/sptests/spfatal20/spfatal20.scn b/testsuites/sptests/spfatal20/spfatal20.scn
index 1c3c529bc6..d6f3afbe8f 100644
--- a/testsuites/sptests/spfatal20/spfatal20.scn
+++ b/testsuites/sptests/spfatal20/spfatal20.scn
@@ -1,2 +1,2 @@
 Fatal error (rtems_termios_initialize cannot create semaphore) hit
-*** END OF TEST ***
+*** END OF TEST FATAL 20 ***
diff --git a/testsuites/sptests/spfatal21/spfatal21.scn b/testsuites/sptests/spfatal21/spfatal21.scn
index c548a1af40..1ea32a5d3f 100644
--- a/testsuites/sptests/spfatal21/spfatal21.scn
+++ b/testsuites/sptests/spfatal21/spfatal21.scn
@@ -1,3 +1,3 @@
 *** TEST FATAL FATAL 21 ***
 Fatal error (sbrk during init fails) hit
-*** END OF TEST ***
+*** END OF TEST FATAL 21 ***
diff --git a/testsuites/sptests/spfatal22/spfatal22.scn b/testsuites/sptests/spfatal22/spfatal22.scn
index 23fe118c0c..b4239e6424 100644
--- a/testsuites/sptests/spfatal22/spfatal22.scn
+++ b/testsuites/sptests/spfatal22/spfatal22.scn
@@ -1,4 +1,4 @@
 *** TEST FATAL FATAL 22 ***
 Allocate_majority_of_heap: 
 Fatal error (libio init out of memory) hit
-*** END OF TEST ***
+*** END OF TEST FATAL 22 ***
diff --git a/testsuites/sptests/spfatal23/spfatal23.scn b/testsuites/sptests/spfatal23/spfatal23.scn
index ed080e2c0d..6985cdd7d3 100644
--- a/testsuites/sptests/spfatal23/spfatal23.scn
+++ b/testsuites/sptests/spfatal23/spfatal23.scn
@@ -1,3 +1,3 @@
 *** TEST FATAL SHUTDOWN WHEN NOT UP ***
 Fatal error (SHUTDOWN WHEN NOT UP) hit
-*** END OF TEST ***
+*** END OF TEST FATAL SHUTDOWN WHEN NOT UP ***
diff --git a/testsuites/sptests/spfatal24/spfatal24.scn b/testsuites/sptests/spfatal24/spfatal24.scn
index 92df4ab1e6..46a4f20409 100644
--- a/testsuites/sptests/spfatal24/spfatal24.scn
+++ b/testsuites/sptests/spfatal24/spfatal24.scn
@@ -1,3 +1,3 @@
 *** TEST FATAL GXX KEY ADD FAILURE ***
 Fatal error (GXX KEY ADD FAILURE) hit
-*** END OF TEST ***
+*** END OF TEST FATAL GXX KEY ADD FAILURE ***
diff --git a/testsuites/sptests/spfatal25/spfatal25.scn b/testsuites/sptests/spfatal25/spfatal25.scn
index 0b61cf8384..93a6b729b8 100644
--- a/testsuites/sptests/spfatal25/spfatal25.scn
+++ b/testsuites/sptests/spfatal25/spfatal25.scn
@@ -1,3 +1,3 @@
 *** TEST FATAL GXX MUTEX INIT FAILED ***
 Fatal error (GXX MUTEX INIT FAILED) hit
-*** END OF TEST ***
+*** END OF TEST FATAL GXX MUTEX INIT FAILED ***
diff --git a/testsuites/sptests/spfatal_support/init.c b/testsuites/sptests/spfatal_support/init.c
index 6716b3ef9d..aacbe3f22f 100644
--- a/testsuites/sptests/spfatal_support/init.c
+++ b/testsuites/sptests/spfatal_support/init.c
@@ -149,7 +149,7 @@ void Fatal_extension(
       && is_internal == FATAL_ERROR_EXPECTED_IS_INTERNAL
       && error == FATAL_ERROR_EXPECTED_ERROR
   ) {
-    printk( "*** END OF TEST ***\n" );
+    printk( "*** END OF TEST FATAL " FATAL_ERROR_TEST_NAME " ***\n" );
   }
 
   if ( _System_state_Is_up( _System_state_Get() ) )