2009-07-21 Joel Sherrill <joel.sherrill@oarcorp.com>

	* spintrcritical06/init.c: Add comment to indicate test is not finished
	and known to not hit the case.
	* Makefile.am, configure.ac: Add a couple more interrupt critical
	section tests.
	* spintrcritical08/.cvsignore, spintrcritical08/Makefile.am,
	spintrcritical08/init.c, spintrcritical08/spintrcritical08.doc,
	spintrcritical08/spintrcritical08.scn, spintrcritical09/.cvsignore,
	spintrcritical09/Makefile.am, spintrcritical09/init.c,
	spintrcritical09/spintrcritical09.doc,
	spintrcritical09/spintrcritical09.scn: New files.

5 files changed, 161 insertions, 0 deletions

diff --git a/testsuites/sptests/spintrcritical08/.cvsignore b/testsuites/sptests/spintrcritical08/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/testsuites/sptests/spintrcritical08/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/testsuites/sptests/spintrcritical08/Makefile.am b/testsuites/sptests/spintrcritical08/Makefile.am
new file mode 100644
index 0000000000..9fa72f9df8
--- /dev/null
+++ b/testsuites/sptests/spintrcritical08/Makefile.am
@@ -0,0 +1,30 @@
+##
+## $Id$
+##
+
+MANAGERS = all
+
+rtems_tests_PROGRAMS = spintrcritical08
+spintrcritical08_SOURCES = init.c \
+    ../spintrcritical_support/intrcritical.c
+
+dist_rtems_tests_DATA = spintrcritical08.scn
+dist_rtems_tests_DATA += spintrcritical08.doc
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
+
+spintrcritical08_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+
+AM_CPPFLAGS += -I$(top_srcdir)/../support/include
+AM_CPPFLAGS += -I$(top_srcdir)/spintrcritical_support
+
+LINK_OBJS = $(spintrcritical08_OBJECTS) $(spintrcritical08_LDADD)
+LINK_LIBS = $(spintrcritical08_LDLIBS)
+
+spintrcritical08$(EXEEXT): $(spintrcritical08_OBJECTS) $(spintrcritical08_DEPENDENCIES)
+	@rm -f spintrcritical08$(EXEEXT)
+	$(make-exe)
+
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/spintrcritical08/init.c b/testsuites/sptests/spintrcritical08/init.c
new file mode 100644
index 0000000000..51b5b17c4b
--- /dev/null
+++ b/testsuites/sptests/spintrcritical08/init.c
@@ -0,0 +1,99 @@
+/*
+ *  COPYRIGHT (c) 1989-2009.
+ *  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.
+ *
+ *  $Id$
+ */
+
+#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__ 1
+#include <tmacros.h>
+#include <intrcritical.h>
+
+rtems_id Main_task;
+rtems_id Period;
+volatile bool case_hit;
+
+rtems_rate_monotonic_period_states getState(void)
+{
+  Objects_Locations       location;
+  Rate_monotonic_Control *period;
+
+  period = (Rate_monotonic_Control *)_Objects_Get(
+    &_Rate_monotonic_Information, Period, &location ); 
+  if ( location != OBJECTS_LOCAL ) {
+    puts( "Bad object lookup" );
+    rtems_test_exit(0);
+  }
+  _Thread_Unnest_dispatch();
+
+  return period->state;
+}
+
+rtems_timer_service_routine test_release_from_isr(
+  rtems_id  timer,
+  void     *arg
+)
+{
+  if ( getState() == RATE_MONOTONIC_EXPIRED_WHILE_BLOCKING )
+    case_hit = true;
+}
+
+rtems_task Init(
+  rtems_task_argument ignored
+)
+{
+  rtems_status_code     sc;
+  int                   resets;
+
+  puts( "\n\n*** TEST INTERRUPT CRITICAL SECTION 08 ***" );
+
+  puts( "Init - Trying to generate period ending while blocking" );
+
+  puts( "Init - rtems_rate_monotonic_create - OK" );
+  sc = rtems_rate_monotonic_create(
+    rtems_build_name( 'P', 'E', 'R', '1' ),
+    &Period
+  );
+  directive_failed( sc, "rtems_rate_monotonic_create" );
+
+  Main_task = rtems_task_self();
+
+  interrupt_critical_section_test_support_initialize( test_release_from_isr );
+
+  case_hit = false;
+
+  for (resets=0 ; case_hit == false && resets< 2 ;) {
+    if ( interrupt_critical_section_test_support_delay() )
+      resets++;
+
+    sc = rtems_rate_monotonic_period( Period, 1 );
+    if ( sc == RTEMS_TIMEOUT )
+      continue;
+    directive_failed( sc, "rtems_monotonic_period");
+  }
+
+  if ( case_hit ) {
+    puts( "Init - It appears the case has been hit" );
+    puts( "*** END OF TEST INTERRUPT CRITICAL SECTION 08 ***" );
+  }
+  rtems_test_exit(0);
+}
+
+/* configuration information */
+
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+
+#define CONFIGURE_MAXIMUM_TASKS       2
+#define CONFIGURE_MAXIMUM_TIMERS      1
+#define CONFIGURE_MAXIMUM_PERIODS     1
+#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
+
+#define CONFIGURE_INIT
+#include <rtems/confdefs.h>
+
+/* global variables */
diff --git a/testsuites/sptests/spintrcritical08/spintrcritical08.doc b/testsuites/sptests/spintrcritical08/spintrcritical08.doc
new file mode 100644
index 0000000000..bc92ea8b9d
--- /dev/null
+++ b/testsuites/sptests/spintrcritical08/spintrcritical08.doc
@@ -0,0 +1,24 @@
+#
+#  $Id$
+#
+#  COPYRIGHT (c) 1989-2009.
+#  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:  spintrcritical08
+
+directives:
+
+  rtems_rate_monotonic_create
+  rtems_rate_monotonic_period
+
+concepts:
+
++ Ensure that having the period expire while we are in the process of
+  blocking on the period is handled properly.
diff --git a/testsuites/sptests/spintrcritical08/spintrcritical08.scn b/testsuites/sptests/spintrcritical08/spintrcritical08.scn
new file mode 100644
index 0000000000..86aa7fad54
--- /dev/null
+++ b/testsuites/sptests/spintrcritical08/spintrcritical08.scn
@@ -0,0 +1,6 @@
+*** TEST INTERRUPT CRITICAL SECTION 08 ***
+Init - Trying to generate period ending while blocking
+Init - rtems_rate_monotonic_create - OK
+Support - rtems_timer_create - creating timer 1
+Init - It appears the case has been hit
+*** END OF TEST INTERRUPT CRITICAL SECTION 08 ***