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

	* Makefile.am, configure.ac: Add test case for a thread timing out on a
	thread queue while another thread is in the process of blocking on
	the same thread queue.
	* spintrcritical15/.cvsignore, spintrcritical15/Makefile.am,
	spintrcritical15/init.c, spintrcritical15/spintrcritical15.doc,
	spintrcritical15/spintrcritical15.scn: New files.

5 files changed, 178 insertions, 0 deletions

diff --git a/testsuites/sptests/spintrcritical15/.cvsignore b/testsuites/sptests/spintrcritical15/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/testsuites/sptests/spintrcritical15/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/testsuites/sptests/spintrcritical15/Makefile.am b/testsuites/sptests/spintrcritical15/Makefile.am
new file mode 100644
index 0000000000..b93a18f396
--- /dev/null
+++ b/testsuites/sptests/spintrcritical15/Makefile.am
@@ -0,0 +1,30 @@
+##
+## $Id$
+##
+
+MANAGERS = all
+
+rtems_tests_PROGRAMS = spintrcritical15
+spintrcritical15_SOURCES = init.c \
+    ../spintrcritical_support/intrcritical.c
+
+dist_rtems_tests_DATA = spintrcritical15.scn
+dist_rtems_tests_DATA += spintrcritical15.doc
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
+
+spintrcritical15_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+
+AM_CPPFLAGS += -I$(top_srcdir)/../support/include
+AM_CPPFLAGS += -I$(top_srcdir)/spintrcritical_support
+
+LINK_OBJS = $(spintrcritical15_OBJECTS) $(spintrcritical15_LDADD)
+LINK_LIBS = $(spintrcritical15_LDLIBS)
+
+spintrcritical15$(EXEEXT): $(spintrcritical15_OBJECTS) $(spintrcritical15_DEPENDENCIES)
+	@rm -f spintrcritical15$(EXEEXT)
+	$(make-exe)
+
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/spintrcritical15/init.c b/testsuites/sptests/spintrcritical15/init.c
new file mode 100644
index 0000000000..ec0785ef01
--- /dev/null
+++ b/testsuites/sptests/spintrcritical15/init.c
@@ -0,0 +1,115 @@
+/*
+ *  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$
+ */
+
+#include <tmacros.h>
+#include <intrcritical.h>
+
+#define TEST_NAME          "15"
+#define INIT_PRIORITY      2
+#define BLOCKER_PRIORITY   1
+
+rtems_id Main_task;
+rtems_id Secondary_task_id;
+rtems_id Semaphore;
+
+rtems_timer_service_routine test_release_from_isr(
+  rtems_id  timer,
+  void     *arg
+)
+{
+}
+
+rtems_task Secondary_task(
+  rtems_task_argument ignored
+)
+{
+  rtems_status_code     sc;
+
+  while (1) {
+
+    sc = rtems_semaphore_obtain( Semaphore, RTEMS_DEFAULT_OPTIONS, 1 );
+    fatal_directive_status( sc, RTEMS_TIMEOUT, "rtems_semaphore_obtain" );
+  }
+}
+
+rtems_task Init(
+  rtems_task_argument ignored
+)
+{
+  rtems_status_code     sc;
+  int                   resets;
+
+  puts(
+    "\n\n*** TEST INTERRUPT CRITICAL SECTION " TEST_NAME " ***\n"
+    "Init - Trying to generate timeout of a thread while another is blocking\n"
+    "Init -   on the same thread queue\n"
+    "Init - There is no way for the test to know if it hits the case"
+  );
+
+  puts( "Init - rtems_semaphore_create - OK" );
+  sc = rtems_semaphore_create(
+    rtems_build_name( 'S', 'M', '1', ' ' ),
+    0,
+    RTEMS_DEFAULT_ATTRIBUTES,
+    RTEMS_NO_PRIORITY,
+    &Semaphore
+  );
+  directive_failed( sc, "rtems_semaphore_create of SM1" );
+
+  puts( "Init - rtems_task_create - OK" );
+  sc = rtems_task_create(
+    rtems_build_name( 'B', 'L', 'C', 'K' ),
+    BLOCKER_PRIORITY,
+    RTEMS_MINIMUM_STACK_SIZE,
+    RTEMS_NO_PREEMPT,
+    RTEMS_DEFAULT_ATTRIBUTES,
+    &Secondary_task_id
+  );
+  directive_failed( sc, "rtems_task_create" );
+
+  sc = rtems_task_start( Secondary_task_id, Secondary_task, 0 );
+  directive_failed( sc, "rtems_task_start" );
+
+  Main_task = rtems_task_self();
+
+  interrupt_critical_section_test_support_initialize( NULL );
+
+  for (resets=0 ; resets<10 ;) {
+    if ( interrupt_critical_section_test_support_delay() )
+      resets++;
+
+    sc = rtems_task_restart( Secondary_task_id, 1 );
+    directive_failed( sc, "rtems_task_restart" );
+
+    sc = rtems_semaphore_obtain( Semaphore, RTEMS_DEFAULT_OPTIONS, 1 );
+    fatal_directive_status( sc, RTEMS_TIMEOUT, "rtems_semaphore_obtain" );
+  }
+
+  puts( "*** END OF TEST INTERRUPT CRITICAL SECTION " TEST_NAME " ***" );
+  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_MICROSECONDS_PER_TICK  1000
+#define CONFIGURE_INIT_TASK_PRIORITY  INIT_PRIORITY
+#define CONFIGURE_INIT_TASK_MODE      RTEMS_PREEMPT
+#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
+
+#define CONFIGURE_INIT
+#include <rtems/confdefs.h>
+
+/* global variables */
diff --git a/testsuites/sptests/spintrcritical15/spintrcritical15.doc b/testsuites/sptests/spintrcritical15/spintrcritical15.doc
new file mode 100644
index 0000000000..f34092fe62
--- /dev/null
+++ b/testsuites/sptests/spintrcritical15/spintrcritical15.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:  spintrcritical15
+
+directives:
+
+  rtems_semaphore_obtain
+  really an odd case in _Thread_queue_Process_timeout
+
+concepts:
+
++ Ensure that a thread timing out on a thread queue while ANOTHER thread is
+  in the process of blocking on the same thread queue is processed correctly.
diff --git a/testsuites/sptests/spintrcritical15/spintrcritical15.scn b/testsuites/sptests/spintrcritical15/spintrcritical15.scn
new file mode 100644
index 0000000000..ee8db40cdd
--- /dev/null
+++ b/testsuites/sptests/spintrcritical15/spintrcritical15.scn
@@ -0,0 +1,7 @@
+*** TEST INTERRUPT CRITICAL SECTION 15 ***
+Init - Trying to generate timeout of a thread while another is blocking
+Init -   on the same thread queue
+Init - There is no way for the test to know if it hits the case
+Init - rtems_semaphore_create - OK
+Init - rtems_task_create - OK
+*** END OF TEST INTERRUPT CRITICAL SECTION 15 ***