2009-08-07 Joel Sherrill <joel.sherrill@OARcorp.com>

	* sp28/init.c, sp28/sp28.scn: Update screen. Add a few missing error
	cases.

3 files changed, 52 insertions, 19 deletions

diff --git a/testsuites/sptests/ChangeLog b/testsuites/sptests/ChangeLog
index 8c7e11e7e9..453b88eb5d 100644
--- a/testsuites/sptests/ChangeLog
+++ b/testsuites/sptests/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-07	Joel Sherrill <joel.sherrill@OARcorp.com>
+
+	* sp28/init.c, sp28/sp28.scn: Update screen. Add a few missing error
+	cases.
+
 2009-08-06	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	* sp64/init.c, sp64/sp64.scn: Chris ensured that nothing is moved until
diff --git a/testsuites/sptests/sp28/init.c b/testsuites/sptests/sp28/init.c
index 18411f0ac9..4abbada522 100644
--- a/testsuites/sptests/sp28/init.c
+++ b/testsuites/sptests/sp28/init.c
@@ -9,24 +9,8 @@
  *  $Id$
  */
 
-#define CONFIGURE_INIT
 #include <tmacros.h>
 
-rtems_task Init(rtems_task_argument argument);
-
-#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
-#define CONFIGURE_MAXIMUM_USER_EXTENSIONS    2
-
-#define CONFIGURE_MAXIMUM_TASKS              4
-#define CONFIGURE_MAXIMUM_TASK_VARIABLES     (4)
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-#define CONFIGURE_MICROSECONDS_PER_TICK      10000
-
-#define CONFIGURE_MICROSECONDS_INIT
-
-#include <rtems/confdefs.h>
-
 #include <bsp.h>
 #include <rtems/error.h>
 #include <stdio.h>
@@ -134,6 +118,14 @@ void test_errors(void)
   /*
    *  task variable get error status codes
    */
+  puts( "task variable get - bad Id - RTEMS_INVALID_ID" );
+  sc = rtems_task_variable_get(
+    rtems_task_self() + 10,
+    (void **)&taskvar1,
+    &value
+  );
+  fatal_directive_status( sc, RTEMS_INVALID_ID, "bad Id" );
+
   puts( "task variable get - NULL pointer - RTEMS_INVALID_ADDRESS" );
   sc = rtems_task_variable_get(RTEMS_SELF, NULL, &value );
   fatal_directive_status( sc, RTEMS_INVALID_ADDRESS, "get NULL pointer" );
@@ -149,6 +141,10 @@ void test_errors(void)
   /*
    *  task variable delete error status codes
    */
+  puts( "task variable delete - bad Id - RTEMS_INVALID_ID" );
+  sc = rtems_task_variable_delete( rtems_task_self() + 10, (void **)&taskvar1 );
+  fatal_directive_status( sc, RTEMS_INVALID_ID, "bad Id" );
+
   puts( "task variable delete - NULL pointer - RTEMS_INVALID_ADDRESS" );
   sc = rtems_task_variable_delete(RTEMS_SELF, NULL);
   fatal_directive_status( sc, RTEMS_INVALID_ADDRESS, "delete NULL pointer" );
@@ -178,6 +174,14 @@ void test_multiple_taskvars(void)
    *  Add multiple task variables and add each twice to
    *  verify that behavior is OK
    */
+  puts( "task variable add - bad Id - RTEMS_INVALID_ID" );
+  sc = rtems_task_variable_add(
+    rtems_task_self() + 10,
+    (void **)&taskvar1,
+    NULL
+  );
+  fatal_directive_status( sc, RTEMS_INVALID_ID, "bad Id" );
+
   puts( "Adding multiple task variables" );
   sc = rtems_task_variable_add(RTEMS_SELF, (void **)&taskvar1, NULL);
   directive_failed( sc, "add multiple #1" );
@@ -380,3 +384,16 @@ rtems_task Init (rtems_task_argument ignored)
 
   rtems_task_suspend (RTEMS_SELF);
 }
+
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_MAXIMUM_USER_EXTENSIONS    2
+
+#define CONFIGURE_MAXIMUM_TASKS              4
+#define CONFIGURE_MAXIMUM_TASK_VARIABLES     (4)
+#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
+#define CONFIGURE_MICROSECONDS_PER_TICK      10000
+
+#define CONFIGURE_INIT
+#include <rtems/confdefs.h>
+
diff --git a/testsuites/sptests/sp28/sp28.scn b/testsuites/sptests/sp28/sp28.scn
index 0afe571017..ae90fbb161 100644
--- a/testsuites/sptests/sp28/sp28.scn
+++ b/testsuites/sptests/sp28/sp28.scn
@@ -1,5 +1,16 @@
 *** START OF TEST 28 ***
-Task variables test begins.  Any output between
-this line and the `Task variables test complete' line indicates an error.
-Task variables test succeeded.
+task variable get - bad Id - RTEMS_INVALID_ID
+task variable get - NULL pointer - RTEMS_INVALID_ADDRESS
+task variable get - bad result - RTEMS_INVALID_ADDRESS
+task variable get - bad pointer - RTEMS_INVALID_ADDRESS
+task variable delete - bad Id - RTEMS_INVALID_ID
+task variable delete - NULL pointer - RTEMS_INVALID_ADDRESS
+task variable delete - bad pointer - RTEMS_INVALID_ADDRESS
+task variable add - bad Id - RTEMS_INVALID_ID
+Adding multiple task variables
+Obtaining multiple task variables
+Deleting multiple task variables
+Adding multiple task variables to delete implicitly
+Deleting task variables in another task
+task_variable_add - returns NO_MEMORY
 *** END OF TEST 28 ***