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, 184 insertions, 0 deletions

diff --git a/testsuites/sptests/spintrcritical09/.cvsignore b/testsuites/sptests/spintrcritical09/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/testsuites/sptests/spintrcritical09/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/testsuites/sptests/spintrcritical09/Makefile.am b/testsuites/sptests/spintrcritical09/Makefile.am
new file mode 100644
index 0000000000..4f27ca55f5
--- /dev/null
+++ b/testsuites/sptests/spintrcritical09/Makefile.am
@@ -0,0 +1,29 @@
+##
+## $Id$
+##
+
+MANAGERS = all
+
+rtems_tests_PROGRAMS = spintrcritical09
+spintrcritical09_SOURCES = init.c ../spintrcritical_support/intrcritical.c
+
+dist_rtems_tests_DATA = spintrcritical09.scn
+dist_rtems_tests_DATA += spintrcritical09.doc
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
+
+spintrcritical09_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+
+AM_CPPFLAGS += -I$(top_srcdir)/../support/include
+AM_CPPFLAGS += -I$(top_srcdir)/spintrcritical_support
+
+LINK_OBJS = $(spintrcritical09_OBJECTS) $(spintrcritical09_LDADD)
+LINK_LIBS = $(spintrcritical09_LDLIBS)
+
+spintrcritical09$(EXEEXT): $(spintrcritical09_OBJECTS) $(spintrcritical09_DEPENDENCIES)
+	@rm -f spintrcritical09$(EXEEXT)
+	$(make-exe)
+
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/spintrcritical09/init.c b/testsuites/sptests/spintrcritical09/init.c
new file mode 100644
index 0000000000..78a0fcb9e0
--- /dev/null
+++ b/testsuites/sptests/spintrcritical09/init.c
@@ -0,0 +1,125 @@
+/*
+ *  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 Flusher_id;
+rtems_id Semaphore;
+volatile bool case_hit;
+
+Thread_blocking_operation_States getState(void)
+{
+  Objects_Locations  location;
+  Semaphore_Control *sem;
+
+  sem = (Semaphore_Control *)_Objects_Get(
+    &_Semaphore_Information, Semaphore, &location ); 
+  if ( location != OBJECTS_LOCAL ) {
+    puts( "Bad object lookup" );
+    rtems_test_exit(0);
+  }
+  _Thread_Unnest_dispatch();
+
+  return sem->Core_control.semaphore.Wait_queue.sync_state;
+}
+
+rtems_timer_service_routine test_release_from_isr(
+  rtems_id  timer,
+  void     *arg
+)
+{
+  if ( getState() == THREAD_BLOCKING_OPERATION_TIMEOUT ) {
+    case_hit = true;
+  }
+}
+
+rtems_task Flusher(
+  rtems_task_argument ignored
+)
+{
+  rtems_status_code     sc;
+
+  while (1) {
+    sc = rtems_semaphore_flush( Semaphore );
+    directive_failed( sc, "rtems_semaphore_flush" );
+
+    sc = rtems_task_wake_after( 2 );
+    directive_failed( sc, "rtems_task_wake_after" );
+  }
+}
+
+rtems_task Init(
+  rtems_task_argument ignored
+)
+{
+  rtems_status_code     sc;
+
+  puts( "\n\n*** TEST INTERRUPT CRITICAL SECTION 09 ***" );
+
+  puts( "Init - Trying to generate timeout from ISR while blocking" );
+  sc = rtems_semaphore_create(
+    rtems_build_name( 'S', 'M', '1', ' ' ),
+    1,
+    RTEMS_DEFAULT_ATTRIBUTES,
+    RTEMS_NO_PRIORITY,
+    &Semaphore
+  );
+  directive_failed( sc, "rtems_semaphore_create of SM1" );
+
+  Main_task = rtems_task_self();
+
+  sc = rtems_task_create(
+    rtems_build_name( 'F', 'L', 'S', 'H' ),
+    1,
+    RTEMS_MINIMUM_STACK_SIZE,
+    RTEMS_DEFAULT_MODES,
+    RTEMS_DEFAULT_ATTRIBUTES,
+    &Flusher_id
+  );
+  directive_failed( sc, "rtems_task_create" );
+
+  sc = rtems_task_start( Flusher_id, Flusher, 0 );
+  directive_failed( sc, "rtems_task_start" );
+
+  interrupt_critical_section_test_support_initialize( test_release_from_isr );
+
+  case_hit = false;
+
+  while (!case_hit) {
+    interrupt_critical_section_test_support_delay();
+
+    (void) rtems_semaphore_obtain( Semaphore, RTEMS_DEFAULT_OPTIONS, 1 );
+  }
+
+  puts( "Init - Case hit" );
+
+  puts( "*** END OF TEST INTERRUPT CRITICAL SECTION 09 ***" );
+  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_SEMAPHORES  1
+#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
+#define CONFIGURE_MICROSECONDS_PER_TICK  500
+
+#define CONFIGURE_INIT
+#include <rtems/confdefs.h>
+
+/* global variables */
diff --git a/testsuites/sptests/spintrcritical09/spintrcritical09.doc b/testsuites/sptests/spintrcritical09/spintrcritical09.doc
new file mode 100644
index 0000000000..09522d5fe6
--- /dev/null
+++ b/testsuites/sptests/spintrcritical09/spintrcritical09.doc
@@ -0,0 +1,28 @@
+#
+#  $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:  spintrcritical09
+
+directives:
+
+  rtems_semaphore_flush
+  rtems_task_wake_after
+  rtems_semaphore_create
+  rtems_task_create
+  rtems_task_start
+  rtems_semaphore_obtain
+
+concepts:
+
++ Ensure that timing out while while the task is in the process
+  of blocking on a thread queue works as expected.
diff --git a/testsuites/sptests/spintrcritical09/spintrcritical09.scn b/testsuites/sptests/spintrcritical09/spintrcritical09.scn
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/testsuites/sptests/spintrcritical09/spintrcritical09.scn