2001-01-16 Joel Sherrill <joel@OARcorp.com>

	* Added tests for task-based timers.  This included the new tests
	sp30 and sp31.
	* Makefile.am, configure.ac: Modified to reflect new tests and files.
	* sp09/screen14.c, sp09/sp09.scn: Modified to add error checks
	for task-based timer services.
	* sp30/.cvsignore, sp30/Makefile.am, sp30/init.c, sp30/resume.c,
	sp30/sp30.doc, sp30/sp30.scn, sp30/system.h, sp30/task1.c,
	sp31/.cvsignore, sp31/Makefile.am, sp31/delay.c, sp31/init.c,
	sp31/prtime.c, sp31/sp31.doc, sp31/sp31.scn, sp31/system.h,
	sp31/task1.c: New files.

9 files changed, 440 insertions, 0 deletions

diff --git a/testsuites/sptests/sp31/.cvsignore b/testsuites/sptests/sp31/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/testsuites/sptests/sp31/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/testsuites/sptests/sp31/Makefile.am b/testsuites/sptests/sp31/Makefile.am
new file mode 100644
index 0000000000..e80f46463e
--- /dev/null
+++ b/testsuites/sptests/sp31/Makefile.am
@@ -0,0 +1,36 @@
+##
+## $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+TEST = sp31
+
+MANAGERS = all
+
+C_FILES = delay.c init.c prtime.c task1.c
+C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+
+DOCTYPES = scn
+DOCS = $(DOCTYPES:%=$(TEST).%)
+
+SRCS = $(C_FILES) $(H_FILES)
+OBJS = $(C_O_FILES)
+
+PRINT_SRCS = $(DOCS)
+
+PGM = ${ARCH}/$(TEST).exe
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../../automake/compile.am
+include $(top_srcdir)/../../../../automake/leaf.am
+include $(top_srcdir)/sptests.am
+
+${PGM}: $(OBJS) $(LINK_FILES)
+	$(make-exe)
+
+all-local: $(ARCH) $(TMPINSTALL_FILES)
+
+EXTRA_DIST = $(C_FILES) $(DOCS)
+
+include $(top_srcdir)/../../../../automake/local.am
diff --git a/testsuites/sptests/sp31/delay.c b/testsuites/sptests/sp31/delay.c
new file mode 100644
index 0000000000..542c76fc65
--- /dev/null
+++ b/testsuites/sptests/sp31/delay.c
@@ -0,0 +1,31 @@
+/*  Delayed_resume
+ *
+ *  This routine is scheduled to be fired as a timer service routine.
+ *  When fired this subprogram resumes Task_1.
+ *
+ *  Input parameters:  NONE
+ *
+ *  Output parameters:  NONE
+ *
+ *  COPYRIGHT (c) 1989-2002.
+ *  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.OARcorp.com/rtems/license.html.
+ *
+ *  $Id$
+ */
+
+#include "system.h"
+
+rtems_timer_service_routine Delayed_resume(
+  rtems_id  ignored_id,
+  void     *ignored_address
+)
+{
+  rtems_status_code status;
+
+  status = rtems_task_resume( Task_id[ 1 ] );
+  directive_failed_with_level( status, "rtems_task_resume of self", 1 );
+}
diff --git a/testsuites/sptests/sp31/init.c b/testsuites/sptests/sp31/init.c
new file mode 100644
index 0000000000..17beb4e28a
--- /dev/null
+++ b/testsuites/sptests/sp31/init.c
@@ -0,0 +1,71 @@
+/*  Init
+ *
+ *  This routine is the initialization task for this test program.
+ *  It is a user initialization task and has the responsibility for creating
+ *  and starting the tasks that make up the test.  If the time of day
+ *  clock is required for the test, it should also be set to a known
+ *  value by this function.
+ *
+ *  Input parameters:
+ *    argument - task argument
+ *
+ *  Output parameters:  NONE
+ *
+ *  COPYRIGHT (c) 1989-2002.
+ *  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.OARcorp.com/rtems/license.html.
+ *
+ *  $Id$
+ */
+
+#define TEST_INIT
+#include "system.h"
+
+rtems_task Init(
+  rtems_task_argument argument
+)
+{
+  rtems_time_of_day  time;
+  rtems_status_code  status;
+
+  puts( "\n\n*** TEST 31 ***" );
+
+  build_time( &time, 12, 31, 1988, 9, 0, 0, 0 );
+
+  status = rtems_clock_set( &time );
+  directive_failed( status, "rtems_clock_set" );
+
+  status = rtems_timer_initiate_server(
+    RTEMS_MINIMUM_STACK_SIZE,
+    RTEMS_DEFAULT_ATTRIBUTES
+  );
+  directive_failed( status, "rtems_timer_initiate_server" );
+
+  Task_name[ 1 ]  = rtems_build_name( 'T', 'A', '1', ' ' );
+  Timer_name[ 1 ] = rtems_build_name( 'T', 'M', '1', ' ' );
+
+  status = rtems_task_create(
+    Task_name[ 1 ],
+    1,
+    RTEMS_MINIMUM_STACK_SIZE * 2,
+    RTEMS_DEFAULT_MODES,
+    RTEMS_DEFAULT_ATTRIBUTES,
+    &Task_id[ 1 ]
+  );
+  directive_failed( status, "rtems_task_create of TA1" );
+
+  status = rtems_task_start( Task_id[ 1 ], Task_1, 0 );
+  directive_failed( status, "rtems_task_start of TA1" );
+
+  puts( "INIT - rtems_timer_create - creating timer 1" );
+  status = rtems_timer_create( Timer_name[ 1 ], &Timer_id[ 1 ] );
+  directive_failed( status, "rtems_timer_create" );
+
+  printf( "INIT - timer 1 has id (0x%x)\n", Timer_id[ 1 ] );
+
+  status = rtems_task_delete( RTEMS_SELF );
+  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
+}
diff --git a/testsuites/sptests/sp31/prtime.c b/testsuites/sptests/sp31/prtime.c
new file mode 100644
index 0000000000..fea6434f2c
--- /dev/null
+++ b/testsuites/sptests/sp31/prtime.c
@@ -0,0 +1,31 @@
+/*  Print_time
+ *
+ *  This routine prints the name of Task_1 and the current time of day.
+ *
+ *  Input parameters:  NONE
+ *
+ *  Output parameters:  NONE
+ *
+ *  COPYRIGHT (c) 1989-2002.
+ *  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.OARcorp.com/rtems/license.html.
+ *
+ *  $Id$
+ */
+
+#include "system.h"
+
+void Print_time( void )
+{
+  rtems_time_of_day time;
+  rtems_status_code status;
+
+  status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
+  directive_failed( status, "rtems_clock_get" );
+
+  put_name( Task_name[ 1 ], FALSE );
+  print_time( "- rtems_clock_get - ", &time, "\n" );
+}
diff --git a/testsuites/sptests/sp31/sp31.doc b/testsuites/sptests/sp31/sp31.doc
new file mode 100644
index 0000000000..a0aa4a7301
--- /dev/null
+++ b/testsuites/sptests/sp31/sp31.doc
@@ -0,0 +1,19 @@
+#
+#  $Id$
+#
+#  COPYRIGHT (c) 1989-2002.
+#  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.OARcorp.com/rtems/license.html.
+#
+
+
+This file describes the directives and concepts tested by this test set.
+
+test set name:  test31
+
+directives:
+
+concepts:
diff --git a/testsuites/sptests/sp31/sp31.scn b/testsuites/sptests/sp31/sp31.scn
new file mode 100644
index 0000000000..f39ac58054
--- /dev/null
+++ b/testsuites/sptests/sp31/sp31.scn
@@ -0,0 +1,29 @@
+*** TEST 31 ***
+INIT - rtems_timer_create - creating timer 1
+INIT - timer 1 has id (0x14010001)
+TA1 - rtems_timer_ident - identing timer 1
+TA1 - timer 1 has id (0x14010001)
+TA1 - rtems_clock_get - 09:00:00   12/31/1988
+TA1 - rtems_timer_server_fire_after - timer 1 in 3 seconds
+TA1 - rtems_task_suspend( RTEMS_SELF )
+TA1 - rtems_clock_get - 09:00:03   12/31/1988
+TA1 - rtems_timer_server_fire_after - timer 1 in 3 seconds
+TA1 - rtems_task_wake_after - 1 second
+TA1 - rtems_clock_get - 09:00:04   12/31/1988
+TA1 - rtems_timer_reset - timer 1
+TA1 - rtems_task_suspend( RTEMS_SELF )
+TA1 - rtems_clock_get - 09:00:07   12/31/1988
+<pause>
+TA1 - rtems_timer_server_fire_after - timer 1 in 3 seconds
+TA1 - rtems_timer_cancel - timer 1
+TA1 - rtems_clock_get - 09:00:07   12/31/1988
+TA1 - rtems_timer_server_fire_when - timer 1 in 3 seconds
+TA1 - rtems_task_suspend( RTEMS_SELF )
+TA1 - rtems_clock_get - 09:00:10   12/31/1988
+TA1 - rtems_timer_server_fire_when - timer 1 in 3 seconds
+TA1 - rtems_task_wake_after - 1 second
+TA1 - rtems_clock_get - 09:00:11   12/31/1988
+TA1 - rtems_timer_cancel - timer 1
+TA1 - rtems_task_wake_after - YIELD (only task at priority)
+TA1 - timer_deleting - timer 1
+*** END OF TEST 31 ***
diff --git a/testsuites/sptests/sp31/system.h b/testsuites/sptests/sp31/system.h
new file mode 100644
index 0000000000..dfda3ccc8a
--- /dev/null
+++ b/testsuites/sptests/sp31/system.h
@@ -0,0 +1,58 @@
+/*  system.h
+ *
+ *  This include file contains information that is included in every
+ *  function in the test set.
+ *
+ *  COPYRIGHT (c) 1989-2002.
+ *  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.OARcorp.com/rtems/license.html.
+ *
+ *  $Id$
+ */
+
+#include <tmacros.h>
+
+/* functions */
+
+rtems_task Init(
+  rtems_task_argument argument
+);
+ 
+rtems_timer_service_routine Delayed_resume(
+  rtems_id  ignored_id,
+  void     *ignored_address
+);
+ 
+void Print_time( void );
+ 
+rtems_task Task_1(
+  rtems_task_argument argument
+);
+
+/* configuration information */
+
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+
+#define CONFIGURE_MAXIMUM_TASKS           3
+#define CONFIGURE_MAXIMUM_TIMERS          2
+#define CONFIGURE_INIT_TASK_STACK_SIZE    (RTEMS_MINIMUM_STACK_SIZE * 2)
+
+#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
+
+#define CONFIGURE_EXTRA_TASK_STACKS       (1 * RTEMS_MINIMUM_STACK_SIZE)
+
+#include <confdefs.h>
+
+/* global variables */
+
+TEST_EXTERN rtems_id   Task_id[ 4 ];         /* array of task ids */
+TEST_EXTERN rtems_name Task_name[ 4 ];       /* array of task names */
+
+TEST_EXTERN rtems_id   Timer_id[ 2 ];    /* array of timer ids */
+TEST_EXTERN rtems_name Timer_name[ 2 ];  /* array of timer names */
+
+/* end of include file */
diff --git a/testsuites/sptests/sp31/task1.c b/testsuites/sptests/sp31/task1.c
new file mode 100644
index 0000000000..f66f0f2aa5
--- /dev/null
+++ b/testsuites/sptests/sp31/task1.c
@@ -0,0 +1,163 @@
+/*  Task_1
+ *
+ *  This routine serves as a test task.  It verifies the basic task
+ *  switching capabilities of the executive.
+ *
+ *  Input parameters:
+ *    argument - task argument
+ *
+ *  Output parameters:  NONE
+ *
+ *  COPYRIGHT (c) 1989-2002.
+ *  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.OARcorp.com/rtems/license.html.
+ *
+ *  $Id$
+ */
+
+#include "system.h"
+
+rtems_task Task_1(
+  rtems_task_argument argument
+)
+{
+  rtems_id          tmid;
+  rtems_time_of_day time;
+  rtems_status_code status;
+
+/* Get id */
+
+  puts( "TA1 - rtems_timer_ident - identing timer 1" );
+  status = rtems_timer_ident( Timer_name[ 1 ], &tmid );
+  directive_failed( status, "rtems_timer_ident" );
+  printf( "TA1 - timer 1 has id (0x%x)\n", tmid );
+
+/* after which is allowed to fire */
+
+  Print_time();
+
+  puts( "TA1 - rtems_timer_server_fire_after - timer 1 in 3 seconds" );
+  status = rtems_timer_server_fire_after(
+    tmid,
+    3 * TICKS_PER_SECOND,
+    Delayed_resume,
+    NULL
+  );
+  directive_failed( status, "rtems_timer_server_fire_after" );
+
+  puts( "TA1 - rtems_task_suspend( RTEMS_SELF )" );
+  status = rtems_task_suspend( RTEMS_SELF );
+  directive_failed( status, "rtems_task_suspend" );
+
+  Print_time();
+
+/* after which is reset and allowed to fire */
+
+  puts( "TA1 - rtems_timer_server_fire_after - timer 1 in 3 seconds" );
+  status = rtems_timer_server_fire_after(
+    tmid,
+    3 * TICKS_PER_SECOND,
+    Delayed_resume,
+    NULL
+  );
+  directive_failed( status, "rtems_timer_server_fire_after" );
+
+  puts( "TA1 - rtems_task_wake_after - 1 second" );
+  status = rtems_task_wake_after( 1 * TICKS_PER_SECOND );
+  directive_failed( status, "rtems_task_wake_after" );
+
+  Print_time();
+
+  puts( "TA1 - rtems_timer_reset - timer 1" );
+  status = rtems_timer_reset( tmid );
+  directive_failed( status, "rtems_timer_reset" );
+
+  puts( "TA1 - rtems_task_suspend( RTEMS_SELF )" );
+  status = rtems_task_suspend( RTEMS_SELF );
+  directive_failed( status, "rtems_task_suspend" );
+
+  Print_time();
+
+  rtems_test_pause();
+
+  /*
+   *  Reset the time since we do not know how long the user waited
+   *  before pressing <cr> at the pause.  This insures that the 
+   *  actual output matches the screen.
+   */
+
+  build_time( &time, 12, 31, 1988, 9, 0, 7, 0 );
+
+  status = rtems_clock_set( &time );
+  directive_failed( status, "rtems_clock_set" );
+
+/* after which is canceled */
+
+  puts( "TA1 - rtems_timer_server_fire_after - timer 1 in 3 seconds" );
+  status = rtems_timer_server_fire_after(
+    tmid,
+    3 * TICKS_PER_SECOND,
+    Delayed_resume,
+    NULL
+  );
+  directive_failed( status, "rtems_timer_server_fire_after" );
+
+  puts( "TA1 - rtems_timer_cancel - timer 1" );
+  status = rtems_timer_cancel( tmid );
+  directive_failed( status, "rtems_timer_cancel" );
+
+/* when which is allowed to fire */
+
+  Print_time();
+
+  status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
+  directive_failed( status, "rtems_clock_get" );
+
+  time.second += 3;
+
+  puts( "TA1 - rtems_timer_server_fire_when - timer 1 in 3 seconds" );
+  status = rtems_timer_server_fire_when( tmid, &time, Delayed_resume, NULL );
+  directive_failed( status, "rtems_timer_server_fire_when" );
+
+  puts( "TA1 - rtems_task_suspend( RTEMS_SELF )" );
+  status = rtems_task_suspend( RTEMS_SELF );
+  directive_failed( status, "rtems_task_suspend" );
+
+  Print_time();
+
+/* when which is canceled */
+
+  status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
+  directive_failed( status, "rtems_clock_get" );
+
+  time.second += 3;
+
+  puts( "TA1 - rtems_timer_server_fire_when - timer 1 in 3 seconds" );
+  status = rtems_timer_server_fire_when( tmid, &time, Delayed_resume, NULL );
+  directive_failed( status, "rtems_timer_server_fire_when" );
+
+  puts( "TA1 - rtems_task_wake_after - 1 second" );
+  status = rtems_task_wake_after( 1 * TICKS_PER_SECOND );
+  directive_failed( status, "rtems_task_wake_after" );
+
+  Print_time();
+
+  puts( "TA1 - rtems_timer_cancel - timer 1" );
+  status = rtems_timer_cancel( tmid );
+  directive_failed( status, "rtems_timer_cancel" );
+
+/* delete */
+  puts( "TA1 - rtems_task_wake_after - YIELD (only task at priority)" );
+  status = rtems_task_wake_after( RTEMS_YIELD_PROCESSOR );
+  directive_failed( status, "rtems_task_wake_after" );
+
+  puts( "TA1 - timer_deleting - timer 1" );
+  status = rtems_timer_delete( tmid );
+  directive_failed( status, "rtems_timer_delete" );
+
+  puts( "*** END OF TEST 31 *** " );
+  exit( 0 );
+}