sptests: split sp09 screen 5,6 into spsem_err01, spsem_err02, and sptask_err01.

sp09 screen 5 split into spsem_err01, sp09 screen 6 split into
spsem_err02, and sptask_err01.

22 files changed, 574 insertions, 79 deletions

diff --git a/testsuites/sptests/Makefile.am b/testsuites/sptests/Makefile.am
index ff080155ca..3910e781d9 100644
--- a/testsuites/sptests/Makefile.am
+++ b/testsuites/sptests/Makefile.am
@@ -30,7 +30,8 @@ SUBDIRS = \
     spsimplesched03 spnsext01 spedfsched01 spedfsched02 spedfsched03 \
     spcbssched01 spcbssched02 spcbssched03 spqreslib sptimespec01 \
     spregion_err01 sppartition_err01 spratemon_err01 spintr_err01 \
-    spsignal_err01 spport_err01 spmsgq_err01 spmsgq_err02
+    spsignal_err01 spport_err01 spmsgq_err01 spmsgq_err02 spsem_err01 \
+    spsem_err02 sptask_err01
 SUBDIRS += spprofiling01
 SUBDIRS += spcache01
 SUBDIRS += sptls03
diff --git a/testsuites/sptests/configure.ac b/testsuites/sptests/configure.ac
index 9f61ad6d88..f8f912aade 100644
--- a/testsuites/sptests/configure.ac
+++ b/testsuites/sptests/configure.ac
@@ -206,6 +206,8 @@ spprivenv01/Makefile
 spqreslib/Makefile
 spratemon_err01/Makefile
 sprbtree01/Makefile
+spsem_err01/Makefile
+spsem_err02/Makefile
 spsem01/Makefile
 spsem02/Makefile
 spsignal_err01/Makefile
@@ -219,6 +221,7 @@ spthreadq01/Makefile
 sptimespec01/Makefile
 spwatchdog/Makefile
 spwkspace/Makefile
+sptask_err01/Makefile
 sptimer_err01/Makefile
 sptimer_err02/Makefile
 spcpuset01/Makefile
diff --git a/testsuites/sptests/sp09/Makefile.am b/testsuites/sptests/sp09/Makefile.am
index ada2075247..b00120535e 100644
--- a/testsuites/sptests/sp09/Makefile.am
+++ b/testsuites/sptests/sp09/Makefile.am
@@ -1,7 +1,6 @@
 
 rtems_tests_PROGRAMS = sp09
 sp09_SOURCES = init.c delay.c isr.c screen01.c screen02.c screen03.c screen04.c \
-    screen05.c screen06.c \
     task1.c task2.c task3.c \
     system.h
 
diff --git a/testsuites/sptests/sp09/sp09.scn b/testsuites/sptests/sp09/sp09.scn
index 8cf36cef7f..db1f2a6189 100644
--- a/testsuites/sptests/sp09/sp09.scn
+++ b/testsuites/sptests/sp09/sp09.scn
@@ -84,40 +84,4 @@ TA1 - rtems_task_wake_after - sleep 1 second - RTEMS_SUCCESSFUL
 TA1 - rtems_clock_set - 08:30:45   02/05/1988 - RTEMS_SUCCESSFUL
 TA1 - current time - Fri Feb  5 08:30:45 1988
 
-<pause - screen 5>
-TA1 - rtems_semaphore_create - RTEMS_INVALID_NAME
-TA1 - rtems_semaphore_create - RTEMS_INVALID_ADDRESS
-TA1 - rtems_semaphore_create - 1 - RTEMS_SUCCESSFUL
-TA1 - rtems_semaphore_create - 2 - RTEMS_SUCCESSFUL
-TA1 - rtems_semaphore_create - 3 - RTEMS_TOO_MANY
-TA1 - rtems_semaphore_create - FIFO and inherit - RTEMS_NOT_DEFINED
-TA1 - rtems_semaphore_create - FIFO and ceiling - RTEMS_NOT_DEFINED
-TA1 - rtems_semaphore_create - ceiling and inherit - RTEMS_NOT_DEFINED
-TA1 - rtems_semaphore_create - RTEMS_NOT_DEFINED
-TA1 - rtems_semaphore_create - RTEMS_INVALID_NUMBER
-TA1 - rtems_semaphore_create - RTEMS_MP_NOT_CONFIGURED
-TA1 - rtems_semaphore_delete - RTEMS_INVALID_ID
-TA1 - rtems_semaphore_delete - local RTEMS_INVALID_ID
-TA1 - rtems_semaphore_ident - global RTEMS_INVALID_NAME
-TA1 - rtems_semaphore_ident - local RTEMS_INVALID_NAME
-TA1 - rtems_semaphore_release - RTEMS_INVALID_ID
-TA1 - rtems_semaphore_flush - RTEMS_INVALID_ID
-<pause - screen 6>
-TA1 - rtems_semaphore_obtain - RTEMS_INVALID_ID
-TA1 - rtems_semaphore_obtain - got sem 1 - RTEMS_SUCCESSFUL
-TA1 - rtems_semaphore_obtain - RTEMS_UNSATISFIED
-TA1 - rtems_semaphore_obtain - timeout in 3 seconds
-TA1 - rtems_semaphore_obtain - woke up with RTEMS_TIMEOUT
-TA1 - rtems_semaphore_release - RTEMS_NOT_OWNER_OF_RESOURCE
-TA1 - rtems_semaphore_release - RTEMS_INVALID_ID
-TA1 - rtems_task_start - start TA2 - RTEMS_SUCCESSFUL
-TA1 - rtems_task_wake_after - yield processor - RTEMS_SUCCESSFUL
-TA2 - rtems_semaphore_obtain - sem 1 - RTEMS_WAIT FOREVER
-TA1 - rtems_semaphore_delete - delete sem 1 - RTEMS_SUCCESSFUL
-TA1 - rtems_semaphore_obtain - binary semaphore
-TA1 - rtems_semaphore_delete - delete sem 2 - RTEMS_RESOURCE_IN_USE
-TA1 - rtems_task_wake_after - yield processor - RTEMS_SUCCESSFUL
-TA2 - rtems_semaphore_obtain - woke up with RTEMS_OBJECT_WAS_DELETED
-TA2 - rtems_task_delete - delete self - RTEMS_SUCCESSFUL
-TA1 - rtems_task_delete TA2 - already deleted RTEMS_INVALID_ID
 *** END OF TEST 9 ***
diff --git a/testsuites/sptests/sp09/task1.c b/testsuites/sptests/sp09/task1.c
index 06296f7bb7..57220cb2cc 100644
--- a/testsuites/sptests/sp09/task1.c
+++ b/testsuites/sptests/sp09/task1.c
@@ -35,12 +35,6 @@ rtems_task Task_1(
   rtems_test_pause_and_screen_number( 4 );
 
   Screen4();
-  rtems_test_pause_and_screen_number( 5 );
-
-  Screen5();
-  rtems_test_pause_and_screen_number( 6 );
-
-  Screen6();
 
   TEST_END();
 
diff --git a/testsuites/sptests/spsem_err01/Makefile.am b/testsuites/sptests/spsem_err01/Makefile.am
new file mode 100644
index 0000000000..dd99edca0f
--- /dev/null
+++ b/testsuites/sptests/spsem_err01/Makefile.am
@@ -0,0 +1,22 @@
+
+rtems_tests_PROGRAMS = spsem_err01
+spsem_err01_SOURCES = init.c system.h
+
+dist_rtems_tests_DATA = spsem_err01.scn
+dist_rtems_tests_DATA += spsem_err01.doc
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
+
+
+AM_CPPFLAGS += -I$(top_srcdir)/../support/include
+
+LINK_OBJS = $(spsem_err01_OBJECTS)
+LINK_LIBS = $(spsem_err01_LDLIBS)
+
+spsem_err01$(EXEEXT): $(spsem_err01_OBJECTS) $(spsem_err01_DEPENDENCIES)
+	@rm -f spsem_err01$(EXEEXT)
+	$(make-exe)
+
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp09/screen05.c b/testsuites/sptests/spsem_err01/init.c
index ce3ea4c23f..6d2d8c08c1 100644
--- a/testsuites/sptests/sp09/screen05.c
+++ b/testsuites/sptests/spsem_err01/init.c
@@ -1,29 +1,35 @@
-/*  Screen5
- *
- *  This routine generates error screen 5 for test 9.
- *
- *  Input parameters:  NONE
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-2009.
+/*
+ *  COPYRIGHT (c) 2014.
  *  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.org/license/LICENSE.
+ *  http://www.rtems.com/license/LICENSE.
  */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
+#define CONFIGURE_INIT
 #include "system.h"
 
-void Screen5()
+#define MESSAGE_SIZE (sizeof(long) * 4)
+
+const char rtems_test_name[] = "SP SEMAPHORE ERROR 01";
+
+rtems_task Init(
+  rtems_task_argument argument
+)
 {
   rtems_status_code status;
 
+  TEST_BEGIN();
+  
+  Semaphore_name[ 1 ]  =  rtems_build_name( 'S', 'M', '1', ' ' );
+  Semaphore_name[ 2 ]  =  rtems_build_name( 'S', 'M', '2', ' ' );
+  Semaphore_name[ 3 ]  =  rtems_build_name( 'S', 'M', '3', ' ' );
+
   /* invalid name */
   status = rtems_semaphore_create(
     0,
@@ -232,4 +238,6 @@ void Screen5()
     "rtems_semaphore_flush with illegal id"
   );
   puts( "TA1 - rtems_semaphore_flush - RTEMS_INVALID_ID" );
+
+  TEST_END();
 }
diff --git a/testsuites/sptests/spsem_err01/spsem_err01.doc b/testsuites/sptests/spsem_err01/spsem_err01.doc
new file mode 100644
index 0000000000..a4bd583d49
--- /dev/null
+++ b/testsuites/sptests/spsem_err01/spsem_err01.doc
@@ -0,0 +1,26 @@
+#  COPYRIGHT (c) 1989-2014.
+#  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.
+#
+
+
+This file describes the directives and concepts tested by this test set.
+
+test set name:  spsem_err01
+
+directives:
+ 
+  sm_create, sm_delete, sm_ident, sm_release, sm_flush,
+
+concepts:
+
+  a.  Verifies all error codes returned by the executive in single
+      processor configurations.
+
+  b.  Verifies error conditions in the following kernel routines or macros:
+        _Ck_date_time, _Expired, _Q_submit, _Get_mnodes, _Get_node,
+        _Free_mem, _Get_mem, _Valid_block, _Set_tcb, _Set_resource,
+        _In_range, _On_boundary
diff --git a/testsuites/sptests/spsem_err01/spsem_err01.scn b/testsuites/sptests/spsem_err01/spsem_err01.scn
new file mode 100644
index 0000000000..00d363d15f
--- /dev/null
+++ b/testsuites/sptests/spsem_err01/spsem_err01.scn
@@ -0,0 +1,19 @@
+*** TEST SEMAPHORE ERROR 01 ***
+TA1 - rtems_semaphore_create - RTEMS_INVALID_NAME
+TA1 - rtems_semaphore_create - RTEMS_INVALID_ADDRESS
+TA1 - rtems_semaphore_create - 1 - RTEMS_SUCCESSFUL
+TA1 - rtems_semaphore_create - 2 - RTEMS_SUCCESSFUL
+TA1 - rtems_semaphore_create - 3 - RTEMS_TOO_MANY
+TA1 - rtems_semaphore_create - FIFO and inherit - RTEMS_NOT_DEFINED
+TA1 - rtems_semaphore_create - FIFO and ceiling - RTEMS_NOT_DEFINED
+TA1 - rtems_semaphore_create - ceiling and inherit - RTEMS_NOT_DEFINED
+TA1 - rtems_semaphore_create - RTEMS_NOT_DEFINED
+TA1 - rtems_semaphore_create - RTEMS_INVALID_NUMBER
+TA1 - rtems_semaphore_create - RTEMS_MP_NOT_CONFIGURED
+TA1 - rtems_semaphore_delete - RTEMS_INVALID_ID
+TA1 - rtems_semaphore_delete - local RTEMS_INVALID_ID
+TA1 - rtems_semaphore_ident - global RTEMS_INVALID_NAME
+TA1 - rtems_semaphore_ident - local RTEMS_INVALID_NAME
+TA1 - rtems_semaphore_release - RTEMS_INVALID_ID
+TA1 - rtems_semaphore_flush - RTEMS_INVALID_ID
+*** END TEST SEMAPHORE ERROR 01 ***
diff --git a/testsuites/sptests/spsem_err01/system.h b/testsuites/sptests/spsem_err01/system.h
new file mode 100644
index 0000000000..76426b223f
--- /dev/null
+++ b/testsuites/sptests/spsem_err01/system.h
@@ -0,0 +1,64 @@
+/*
+ *  This include file contains information that is included in every
+ *  function in the test set.
+ */
+
+/*
+ *  COPYRIGHT (c) 1989-2014.
+ *  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.
+ */
+
+#include <tmacros.h>
+
+/* functions */
+
+rtems_task Init(
+  rtems_task_argument argument
+);
+
+/* configuration information */
+
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+
+#define CONFIGURE_MAXIMUM_TASKS              10
+#define CONFIGURE_MAXIMUM_TIMERS              1
+#define CONFIGURE_MAXIMUM_SEMAPHORES          2
+#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES      1
+#define CONFIGURE_MAXIMUM_PERIODS             1
+#define CONFIGURE_MAXIMUM_USER_EXTENSIONS     0
+#define CONFIGURE_TICKS_PER_TIMESLICE       100
+
+#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
+
+#define CONFIGURE_EXTRA_TASK_STACKS         (20 * RTEMS_MINIMUM_STACK_SIZE)
+
+#include <rtems/confdefs.h>
+
+/* global variables */
+
+TEST_EXTERN rtems_id   Task_id[ 11 ];       /* array of task ids */
+TEST_EXTERN rtems_name Task_name[ 11 ];     /* array of task names */
+
+TEST_EXTERN rtems_name Semaphore_name[ 4 ]; /* array of semaphore names */
+TEST_EXTERN rtems_id   Semaphore_id[ 4 ];   /* array of semaphore ids */
+
+TEST_EXTERN rtems_name Queue_name[ 3 ];     /* array of queue names */
+TEST_EXTERN rtems_id   Queue_id[ 3 ];       /* array of queue ids */
+
+TEST_EXTERN rtems_name Port_name[ 2 ];      /* array of port names */
+TEST_EXTERN rtems_id   Port_id[ 2 ];        /* array of port ids */
+
+TEST_EXTERN rtems_name Period_name[ 2 ];    /* array of period names */
+TEST_EXTERN rtems_id   Period_id[ 2 ];      /* array of period ids */
+
+TEST_EXTERN rtems_id   Junk_id;             /* id used to return errors */
+
+#define Internal_port_area (void *) 0x00001000
+#define External_port_area (void *) 0x00002000
+
+/* end of include file */
diff --git a/testsuites/sptests/spsem_err02/Makefile.am b/testsuites/sptests/spsem_err02/Makefile.am
new file mode 100644
index 0000000000..fc28cb84ca
--- /dev/null
+++ b/testsuites/sptests/spsem_err02/Makefile.am
@@ -0,0 +1,22 @@
+
+rtems_tests_PROGRAMS = spsem_err02
+spsem_err02_SOURCES = init.c task2.c system.h
+
+dist_rtems_tests_DATA = spsem_err02.scn
+dist_rtems_tests_DATA += spsem_err02.doc
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
+
+
+AM_CPPFLAGS += -I$(top_srcdir)/../support/include
+
+LINK_OBJS = $(spsem_err02_OBJECTS)
+LINK_LIBS = $(spsem_err02_LDLIBS)
+
+spsem_err02$(EXEEXT): $(spsem_err02_OBJECTS) $(spsem_err02_DEPENDENCIES)
+	@rm -f spsem_err02$(EXEEXT)
+	$(make-exe)
+
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp09/screen06.c b/testsuites/sptests/spsem_err02/init.c
index da1ab11ae9..bd76a72118 100644
--- a/testsuites/sptests/sp09/screen06.c
+++ b/testsuites/sptests/spsem_err02/init.c
@@ -1,28 +1,68 @@
-/*  Screen6
- *
- *  This routine generates error screen 6 for test 9.
- *
- *  Input parameters:  NONE
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-2009.
+/*
+ *  COPYRIGHT (c) 2014.
  *  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.org/license/LICENSE.
+ *  http://www.rtems.com/license/LICENSE.
  */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
+#define CONFIGURE_INIT
 #include "system.h"
 
-void Screen6()
+const char rtems_test_name[] = "SP SEMAPHORE ERROR 02";
+
+rtems_task Init(
+  rtems_task_argument argument
+)
 {
   rtems_status_code status;
+  
+  TEST_BEGIN();
+   
+  Semaphore_name[ 1 ]  =  rtems_build_name( 'S', 'M', '1', ' ' );
+  Semaphore_name[ 2 ]  =  rtems_build_name( 'S', 'M', '2', ' ' );
+  Task_name[ 2 ]       =  rtems_build_name( 'T', 'A', '2', ' ' );
+
+  status = rtems_task_create(
+    Task_name[ 2 ],
+    1,
+    RTEMS_MINIMUM_STACK_SIZE,
+    RTEMS_DEFAULT_MODES,
+    RTEMS_DEFAULT_ATTRIBUTES,
+    &Task_id[ 2 ]
+  );
+  directive_failed( status, "rtems_task_create of TA2" );
+  puts( "TA1 - rtems_task_create - TA2 created - RTEMS_SUCCESSFUL" );
+  
+  puts( "TA1 - rtems_task_start - start TA2 - RTEMS_SUCCESSFUL" );
+  status = rtems_task_start( Task_id[ 2 ], Task_2, 0 );
+  directive_failed( status, "rtems_task_start of TA2" ); 
+
+  /* OK */
+  status = rtems_semaphore_create(
+    Semaphore_name[ 1 ],
+    1,
+    RTEMS_DEFAULT_ATTRIBUTES,
+    RTEMS_NO_PRIORITY,
+    &Semaphore_id[ 1 ]
+  );
+  directive_failed( status, "rtems_semaphore_create" );
+  puts( "TA1 - rtems_semaphore_create - 1 - RTEMS_SUCCESSFUL" );
+
+  status = rtems_semaphore_create(
+    Semaphore_name[ 2 ],
+    1,
+    RTEMS_BINARY_SEMAPHORE | RTEMS_PRIORITY | RTEMS_INHERIT_PRIORITY,
+    RTEMS_NO_PRIORITY,
+    &Semaphore_id[ 2 ]
+  );
+  directive_failed( status, "rtems_semaphore_create" );
+  puts( "TA1 - rtems_semaphore_create - 2 - RTEMS_SUCCESSFUL" );
 
   status = rtems_semaphore_obtain(
     100,
@@ -85,10 +125,6 @@ void Screen6()
   );
   puts( "TA1 - rtems_semaphore_release - RTEMS_INVALID_ID" );
 
-  puts( "TA1 - rtems_task_start - start TA2 - RTEMS_SUCCESSFUL" );
-  status = rtems_task_start( Task_id[ 2 ], Task_2, 0 );
-  directive_failed( status, "rtems_task_start of TA2" );
-
   puts( "TA1 - rtems_task_wake_after - yield processor - RTEMS_SUCCESSFUL" );
   status = rtems_task_wake_after( RTEMS_YIELD_PROCESSOR );
   directive_failed( status, "rtems_task_wake_after (yield)" );
@@ -106,6 +142,7 @@ void Screen6()
   directive_failed( status, "rtems_semaphore_obtain");
 
   puts( "TA1 - rtems_semaphore_delete - delete sem 2 - RTEMS_RESOURCE_IN_USE" );
+
   status = rtems_semaphore_delete( Semaphore_id[ 2 ] );
   fatal_directive_status(
      status,
@@ -116,13 +153,6 @@ void Screen6()
   puts( "TA1 - rtems_task_wake_after - yield processor - RTEMS_SUCCESSFUL" );
   status = rtems_task_wake_after( RTEMS_YIELD_PROCESSOR );
   directive_failed( status, "rtems_task_wake_after (yield)" );
-
-  status = rtems_task_delete( Task_id[ 2 ] );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ID,
-    "rtems_task_delete after the task has been deleted"
-  );
-
-  puts( "TA1 - rtems_task_delete TA2 - already deleted RTEMS_INVALID_ID" );
+  
+  TEST_END();
 }
diff --git a/testsuites/sptests/spsem_err02/spsem_err02.doc b/testsuites/sptests/spsem_err02/spsem_err02.doc
new file mode 100644
index 0000000000..b391479811
--- /dev/null
+++ b/testsuites/sptests/spsem_err02/spsem_err02.doc
@@ -0,0 +1,25 @@
+#  COPYRIGHT (c) 1989-2014.
+#  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.
+#
+
+
+This file describes the directives and concepts tested by this test set.
+
+test set name:  test9
+
+directives:
+  sm_create, sm_obtain, sm_release, sm_delete
+
+concepts:
+
+  a.  Verifies all error codes returned by the executive in single
+      processor configurations.
+
+  b.  Verifies error conditions in the following kernel routines or macros:
+        _Ck_date_time, _Expired, _Q_submit, _Get_mnodes, _Get_node,
+        _Free_mem, _Get_mem, _Valid_block, _Set_tcb, _Set_resource,
+        _In_range, _On_boundary
diff --git a/testsuites/sptests/spsem_err02/spsem_err02.scn b/testsuites/sptests/spsem_err02/spsem_err02.scn
new file mode 100644
index 0000000000..56fa2e8290
--- /dev/null
+++ b/testsuites/sptests/spsem_err02/spsem_err02.scn
@@ -0,0 +1,20 @@
+*** TEST SEMAPHORE ERROR 02 ***
+TA1 - rtems_task_create - TA2 created - RTEMS_SUCCESSFUL
+TA1 - rtems_task_start - start TA2 - RTEMS_SUCCESSFUL
+TA1 - rtems_semaphore_create - 1 - RTEMS_SUCCESSFUL
+TA1 - rtems_semaphore_create - 2 - RTEMS_SUCCESSFUL
+TA1 - rtems_semaphore_obtain - RTEMS_INVALID_ID
+TA1 - rtems_semaphore_obtain - got sem 1 - RTEMS_SUCCESSFUL
+TA1 - rtems_semaphore_obtain - RTEMS_UNSATISFIED
+TA1 - rtems_semaphore_obtain - timeout in 3 seconds
+TA2 - rtems_semaphore_obtain - sem 1 - RTEMS_WAIT FOREVER
+TA1 - rtems_semaphore_obtain - woke up with RTEMS_TIMEOUT
+TA1 - rtems_semaphore_release - RTEMS_NOT_OWNER_OF_RESOURCE
+TA1 - rtems_semaphore_release - RTEMS_INVALID_ID
+TA1 - rtems_task_wake_after - yield processor - RTEMS_SUCCESSFUL
+TA1 - rtems_semaphore_delete - delete sem 1 - RTEMS_SUCCESSFUL
+TA1 - rtems_semaphore_obtain - binary semaphore
+TA1 - rtems_semaphore_delete - delete sem 2 - RTEMS_RESOURCE_IN_USE
+TA1 - rtems_task_wake_after - yield processor - RTEMS_SUCCESSFUL
+TA2 - rtems_semaphore_obtain - woke up with RTEMS_OBJECT_WAS_DELETED
+*** END TEST SEMAPHORE ERROR 02 ***
diff --git a/testsuites/sptests/spsem_err02/system.h b/testsuites/sptests/spsem_err02/system.h
new file mode 100644
index 0000000000..cc48e74b61
--- /dev/null
+++ b/testsuites/sptests/spsem_err02/system.h
@@ -0,0 +1,54 @@
+/*
+ *  This include file contains information that is included in every
+ *  function in the test set.
+ */
+
+/*
+ *  COPYRIGHT (c) 1989-2014.
+ *  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.
+ */
+
+#include <tmacros.h>
+
+/* functions */
+
+rtems_task Init(
+  rtems_task_argument argument
+);
+
+rtems_task Task_2(
+  rtems_task_argument argument
+);
+
+/* configuration information */
+
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+
+#define CONFIGURE_MAXIMUM_TASKS              10
+#define CONFIGURE_MAXIMUM_TIMERS              1
+#define CONFIGURE_MAXIMUM_SEMAPHORES          2
+#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES      1
+#define CONFIGURE_MAXIMUM_PERIODS             1
+#define CONFIGURE_MAXIMUM_USER_EXTENSIONS     0
+#define CONFIGURE_TICKS_PER_TIMESLICE       100
+
+#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
+
+#define CONFIGURE_EXTRA_TASK_STACKS         (20 * RTEMS_MINIMUM_STACK_SIZE)
+
+#include <rtems/confdefs.h>
+
+/* global variables */
+
+TEST_EXTERN rtems_id   Task_id[ 11 ];       /* array of task ids */
+TEST_EXTERN rtems_name Task_name[ 11 ];     /* array of task names */
+
+TEST_EXTERN rtems_name Semaphore_name[ 4 ]; /* array of semaphore names */
+TEST_EXTERN rtems_id   Semaphore_id[ 4 ];   /* array of semaphore ids */
+
+/* end of include file */
diff --git a/testsuites/sptests/spsem_err02/task2.c b/testsuites/sptests/spsem_err02/task2.c
new file mode 100644
index 0000000000..e415acf2f6
--- /dev/null
+++ b/testsuites/sptests/spsem_err02/task2.c
@@ -0,0 +1,48 @@
+/*  Task_2
+ *
+ *  This routine serves as a test task.  Its only purpose is to generate the
+ *  error where a semaphore is deleted while a task is waiting for it.
+ *
+ *  Input parameters:
+ *    argument - task argument
+ *
+ *  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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "system.h"
+
+rtems_task Task_2(
+  rtems_task_argument argument
+)
+{
+  rtems_status_code status;
+
+  puts( "TA2 - rtems_semaphore_obtain - sem 1 - RTEMS_WAIT FOREVER" );
+  status = rtems_semaphore_obtain(
+    Semaphore_id[ 1 ],
+    RTEMS_DEFAULT_OPTIONS,
+    RTEMS_NO_TIMEOUT
+  );
+  fatal_directive_status(
+    status,
+    RTEMS_OBJECT_WAS_DELETED,
+    "rtems_semaphore_obtain waiting to be deleted"
+  );
+  puts(
+    "TA2 - rtems_semaphore_obtain - woke up with RTEMS_OBJECT_WAS_DELETED"
+  );
+
+  status = rtems_task_delete( RTEMS_SELF );
+  directive_failed( status, "rtems_task_delete of TA2" );
+}
diff --git a/testsuites/sptests/sptask_err01/Makefile.am b/testsuites/sptests/sptask_err01/Makefile.am
new file mode 100644
index 0000000000..111891cad8
--- /dev/null
+++ b/testsuites/sptests/sptask_err01/Makefile.am
@@ -0,0 +1,22 @@
+
+rtems_tests_PROGRAMS = sptask_err01
+sptask_err01_SOURCES = init.c task2.c system.h
+
+dist_rtems_tests_DATA = sptask_err01.scn
+dist_rtems_tests_DATA += sptask_err01.doc
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
+
+
+AM_CPPFLAGS += -I$(top_srcdir)/../support/include
+
+LINK_OBJS = $(sptask_err01_OBJECTS)
+LINK_LIBS = $(sptask_err01_LDLIBS)
+
+sptask_err01$(EXEEXT): $(sptask_err01_OBJECTS) $(sptask_err01_DEPENDENCIES)
+	@rm -f sptask_err01$(EXEEXT)
+	$(make-exe)
+
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sptask_err01/init.c b/testsuites/sptests/sptask_err01/init.c
new file mode 100644
index 0000000000..7289331608
--- /dev/null
+++ b/testsuites/sptests/sptask_err01/init.c
@@ -0,0 +1,57 @@
+/*
+ *  COPYRIGHT (c) 2014.
+ *  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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#define CONFIGURE_INIT
+#include "system.h"
+
+const char rtems_test_name[] = "SP TASK ERROR 01";
+
+rtems_task Init(
+  rtems_task_argument argument
+)
+{
+  rtems_status_code status;
+  
+  TEST_BEGIN();
+   
+  Task_name[ 2 ]       =  rtems_build_name( 'T', 'A', '2', ' ' );
+
+  status = rtems_task_create(
+    Task_name[ 2 ],
+    1,
+    RTEMS_MINIMUM_STACK_SIZE,
+    RTEMS_DEFAULT_MODES,
+    RTEMS_DEFAULT_ATTRIBUTES,
+    &Task_id[ 2 ]
+  );
+  directive_failed( status, "rtems_task_create of TA2" );
+  puts( "TA1 - rtems_task_create - TA2 created - RTEMS_SUCCESSFUL" );
+  
+  puts( "TA1 - rtems_task_start - start TA2 - RTEMS_SUCCESSFUL" );
+  status = rtems_task_start( Task_id[ 2 ], Task_2, 0 );
+  directive_failed( status, "rtems_task_start of TA2" ); 
+  
+  puts( "TA1 - rtems_task_wake_after - yield processor - RTEMS_SUCCESSFUL" );
+  status = rtems_task_wake_after( RTEMS_YIELD_PROCESSOR );
+  directive_failed( status, "rtems_task_wake_after (yield)" );
+
+  status = rtems_task_delete( Task_id[ 2 ] );
+  fatal_directive_status(
+    status,
+    RTEMS_INVALID_ID,
+    "rtems_task_delete after the task has been deleted"
+  );
+  puts( "TA1 - rtems_task_delete TA2 - already deleted RTEMS_INVALID_ID" );
+
+  TEST_END();
+}
diff --git a/testsuites/sptests/sptask_err01/sptask_err01.doc b/testsuites/sptests/sptask_err01/sptask_err01.doc
new file mode 100644
index 0000000000..2475cb8923
--- /dev/null
+++ b/testsuites/sptests/sptask_err01/sptask_err01.doc
@@ -0,0 +1,25 @@
+#  COPYRIGHT (c) 1989-2014.
+#  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.
+#
+
+
+This file describes the directives and concepts tested by this test set.
+
+test set name:  sptask_err01
+
+directives:
+  t_create, t_delete, t_wkafter
+  
+concepts:
+
+  a.  Verifies all error codes returned by the executive in single
+      processor configurations.
+
+  b.  Verifies error conditions in the following kernel routines or macros:
+        _Ck_date_time, _Expired, _Q_submit, _Get_mnodes, _Get_node,
+        _Free_mem, _Get_mem, _Valid_block, _Set_tcb, _Set_resource,
+        _In_range, _On_boundary
diff --git a/testsuites/sptests/sptask_err01/sptask_err01.scn b/testsuites/sptests/sptask_err01/sptask_err01.scn
new file mode 100644
index 0000000000..eccf90fce7
--- /dev/null
+++ b/testsuites/sptests/sptask_err01/sptask_err01.scn
@@ -0,0 +1,7 @@
+*** TEST TASK ERROR 01 ***
+TA1 - rtems_task_create - TA2 created - RTEMS_SUCCESSFUL
+TA1 - rtems_task_start - start TA2 - RTEMS_SUCCESSFUL
+TA1 - rtems_task_wake_after - yield processor - RTEMS_SUCCESSFUL
+TA2 - rtems_task_delete - delete self - RTEMS_SUCCESSFUL
+TA1 - rtems_task_delete TA2 - already deleted RTEMS_INVALID_ID
+*** END TEST TASK ERROR 01 ***
diff --git a/testsuites/sptests/sptask_err01/system.h b/testsuites/sptests/sptask_err01/system.h
new file mode 100644
index 0000000000..6b6ace72e0
--- /dev/null
+++ b/testsuites/sptests/sptask_err01/system.h
@@ -0,0 +1,51 @@
+/*
+ *  This include file contains information that is included in every
+ *  function in the test set.
+ */
+
+/*
+ *  COPYRIGHT (c) 1989-2014.
+ *  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.
+ */
+
+#include <tmacros.h>
+
+/* functions */
+
+rtems_task Init(
+  rtems_task_argument argument
+);
+
+rtems_task Task_2(
+  rtems_task_argument argument
+);
+
+/* configuration information */
+
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+
+#define CONFIGURE_MAXIMUM_TASKS              10
+#define CONFIGURE_MAXIMUM_TIMERS              1
+#define CONFIGURE_MAXIMUM_SEMAPHORES          2
+#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES      1
+#define CONFIGURE_MAXIMUM_PERIODS             1
+#define CONFIGURE_MAXIMUM_USER_EXTENSIONS     0
+#define CONFIGURE_TICKS_PER_TIMESLICE       100
+
+#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
+
+#define CONFIGURE_EXTRA_TASK_STACKS         (20 * RTEMS_MINIMUM_STACK_SIZE)
+
+#include <rtems/confdefs.h>
+
+/* global variables */
+
+TEST_EXTERN rtems_id   Task_id[ 11 ];       /* array of task ids */
+TEST_EXTERN rtems_name Task_name[ 11 ];     /* array of task names */
+
+/* end of include file */
diff --git a/testsuites/sptests/sptask_err01/task2.c b/testsuites/sptests/sptask_err01/task2.c
new file mode 100644
index 0000000000..c187fa7aeb
--- /dev/null
+++ b/testsuites/sptests/sptask_err01/task2.c
@@ -0,0 +1,34 @@
+/*  Task_2
+ *
+ *  This routine serves as a test task.  Its only purpose is to generate the
+ *  error where a semaphore is deleted while a task is waiting for it.
+ *
+ *  Input parameters:
+ *    argument - task argument
+ *
+ *  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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "system.h"
+
+rtems_task Task_2(
+  rtems_task_argument argument
+)
+{
+  rtems_status_code status;
+
+  puts( "TA2 - rtems_task_delete - delete self - RTEMS_SUCCESSFUL" );
+  status = rtems_task_delete( RTEMS_SELF );
+  directive_failed( status, "rtems_task_delete of TA2" );
+}