2010-06-19 Joel Sherrill <joel.sherrill@oarcorp.com>

	* sp09/screen01.c, sp09/sp09.scn, sp43/init.c, sp43/sp43.scn,
	spfatal_support/init.c: Remove references to ITRON constants.

6 files changed, 8 insertions, 33 deletions

diff --git a/testsuites/sptests/ChangeLog b/testsuites/sptests/ChangeLog
index d2a3ac02ff..0f5c412d6c 100644
--- a/testsuites/sptests/ChangeLog
+++ b/testsuites/sptests/ChangeLog
@@ -1,5 +1,10 @@
 2010-06-19	Joel Sherrill <joel.sherrill@oarcorp.com>
 
+	* sp09/screen01.c, sp09/sp09.scn, sp43/init.c, sp43/sp43.scn,
+	spfatal_support/init.c: Remove references to ITRON constants.
+
+2010-06-19	Joel Sherrill <joel.sherrill@oarcorp.com>
+
 	* Makefile.am, configure.ac: Add sp70 to test slot
 	reclamation and reuse for unlimited object configuration.
 	* sp70/.cvsignore, sp70/Makefile.am, sp70/init.c, sp70/sp70.doc,
diff --git a/testsuites/sptests/sp09/screen01.c b/testsuites/sptests/sp09/screen01.c
index 3ca8ebbff2..3b487c813c 100644
--- a/testsuites/sptests/sp09/screen01.c
+++ b/testsuites/sptests/sp09/screen01.c
@@ -102,27 +102,6 @@ void Screen1()
     "rtems_task_get_note with non-task ID"
   );
 
-  puts( "TA1 - rtems_task_get_note - RTEMS_INVALID_ID (no tasks in API)" );
-  status = rtems_task_get_note(
-    rtems_build_id( OBJECTS_ITRON_API, OBJECTS_ITRON_TASKS, 1, 1 ),
-    RTEMS_NOTEPAD_LAST,
-    &notepad_value
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ID,
-    "rtems_task_get_note with no tasks in API"
-  );
-
-  puts( "TA1 - rtems_object_get_classic_name - bad ID" );
-  status = rtems_object_get_classic_name(
-    rtems_build_id( OBJECTS_ITRON_API, OBJECTS_ITRON_TASKS, 1, 1 ),
-    &task_name
-  );
-  fatal_directive_status( status, RTEMS_INVALID_ID,
-    "rtems_object_get_classic_name with no tasks in API"
-  );
-
   /* NULL param */
   status = rtems_task_ident( RTEMS_SELF, RTEMS_SEARCH_ALL_NODES, NULL );
   fatal_directive_status(
diff --git a/testsuites/sptests/sp09/sp09.scn b/testsuites/sptests/sp09/sp09.scn
index 89518f9274..22c18cbb3d 100644
--- a/testsuites/sptests/sp09/sp09.scn
+++ b/testsuites/sptests/sp09/sp09.scn
@@ -8,8 +8,6 @@ TA1 - rtems_task_get_note - RTEMS_INVALID_ADDRESS
 TA1 - rtems_task_get_note - RTEMS_INVALID_NUMBER
 TA1 - rtems_task_get_note - RTEMS_INVALID_ID
 TA1 - rtems_task_get_note - RTEMS_INVALID_ID
-TA1 - rtems_task_get_note - RTEMS_INVALID_ID (no tasks in API)
-TA1 - rtems_object_get_classic_name - bad ID
 TA1 - rtems_task_ident - RTEMS_INVALID_ADDRESS
 TA1 - rtems_task_ident - current task RTEMS_SUCCESSFUL
 TA1 - rtems_task_ident - global RTEMS_INVALID_NAME
diff --git a/testsuites/sptests/sp43/init.c b/testsuites/sptests/sp43/init.c
index 6377fb3f9a..ff1beff865 100644
--- a/testsuites/sptests/sp43/init.c
+++ b/testsuites/sptests/sp43/init.c
@@ -323,11 +323,6 @@ rtems_task Init(
   printf( "rtems_object_api_maximum_class(OBJECTS_CLASSIC_API) returned %d\n",
           rtems_object_api_maximum_class(OBJECTS_CLASSIC_API) );
 
-  printf( "rtems_object_api_minimum_class(OBJECTS_ITRON_API) returned %d\n",
-          rtems_object_api_minimum_class(OBJECTS_ITRON_API) );
-  printf( "rtems_object_api_maximum_class(OBJECTS_ITRON_API) returned %d\n",
-          rtems_object_api_maximum_class(OBJECTS_ITRON_API) );
-
   /*
    *  Another screen break for the API and class name tests
    */
@@ -341,8 +336,10 @@ rtems_task Init(
      rtems_object_get_api_name(OBJECTS_INTERNAL_API) );
   printf( "rtems_object_get_api_name(CLASSIC_API) = %s\n",
      rtems_object_get_api_name(OBJECTS_CLASSIC_API) );
+#if 0
   printf( "rtems_object_get_api_name(ITRON_API) = %s\n",
      rtems_object_get_api_name(OBJECTS_ITRON_API) );
+#endif
 
   printf( "rtems_object_get_api_class_name(0, RTEMS_TASKS) = %s\n",
     rtems_object_get_api_class_name( 0, OBJECTS_RTEMS_TASKS ) );
diff --git a/testsuites/sptests/sp43/sp43.scn b/testsuites/sptests/sp43/sp43.scn
index fd75b07dba..4b496fe051 100644
--- a/testsuites/sptests/sp43/sp43.scn
+++ b/testsuites/sptests/sp43/sp43.scn
@@ -55,14 +55,11 @@ rtems_object_api_minimum_class(OBJECTS_INTERNAL_API) returned 1
 rtems_object_api_maximum_class(OBJECTS_INTERNAL_API) returned 2
 rtems_object_api_minimum_class(OBJECTS_CLASSIC_API) returned 1
 rtems_object_api_maximum_class(OBJECTS_CLASSIC_API) returned 10
-rtems_object_api_minimum_class(OBJECTS_ITRON_API) returned 1
-rtems_object_api_maximum_class(OBJECTS_ITRON_API) returned 8
 <pause>
 rtems_object_get_api_name(0) = BAD CLASS
 rtems_object_get_api_name(255) = BAD CLASS
 rtems_object_get_api_name(INTERNAL_API) = Internal
 rtems_object_get_api_name(CLASSIC_API) = Classic
-rtems_object_get_api_name(ITRON_API) = ITRON
 rtems_object_get_api_class_name(0, RTEMS_TASKS) = BAD API
 rtems_object_get_api_class_name(CLASSIC_API, 0) = BAD CLASS
 rtems_object_get_api_class_name(INTERNAL_API, MUTEXES) = Mutex
diff --git a/testsuites/sptests/spfatal_support/init.c b/testsuites/sptests/spfatal_support/init.c
index f42bad2830..a3e87b0aaa 100644
--- a/testsuites/sptests/spfatal_support/init.c
+++ b/testsuites/sptests/spfatal_support/init.c
@@ -38,7 +38,6 @@ char *Sources[] = {
   "INTERNAL_ERROR_CORE",
   "INTERNAL_ERROR_RTEMS_API",
   "INTERNAL_ERROR_POSIX_API",
-  "INTERNAL_ERROR_ITRON_API"
 };
 
 
@@ -111,7 +110,7 @@ void Put_Error( uint32_t source, uint32_t error )
 
 void Put_Source( uint32_t source )
 {
-  if ( source > INTERNAL_ERROR_ITRON_API )
+  if ( source > INTERNAL_ERROR_POSIX_API )
     printk("Unknown Source (%d)", source);
   else
     printk( Sources[ source ] );