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

	* Makefile.am, configure.ac, spintrcritical06/init.c: Add first attempt
	at hitting interrupt synchronization critical section in thread queue
	enqueue priority for reverse insertions.
	* spintrcritical07/.cvsignore, spintrcritical07/Makefile.am,
	spintrcritical07/spintrcritical07.doc,
	spintrcritical07/spintrcritical07.scn: New files.

8 files changed, 89 insertions, 1 deletions

diff --git a/testsuites/sptests/ChangeLog b/testsuites/sptests/ChangeLog
index ebdea461ba..565967ea52 100644
--- a/testsuites/sptests/ChangeLog
+++ b/testsuites/sptests/ChangeLog
@@ -1,3 +1,12 @@
+2009-07-20	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* Makefile.am, configure.ac, spintrcritical06/init.c: Add first attempt
+	at hitting interrupt synchronization critical section in thread queue
+	enqueue priority for reverse insertions.
+	* spintrcritical07/.cvsignore, spintrcritical07/Makefile.am,
+	spintrcritical07/spintrcritical07.doc,
+	spintrcritical07/spintrcritical07.scn: New files.
+
 2009-07-20	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	* Makefile.am, configure.ac: Add test case for the
diff --git a/testsuites/sptests/Makefile.am b/testsuites/sptests/Makefile.am
index d03d50968d..2eaec83f40 100644
--- a/testsuites/sptests/Makefile.am
+++ b/testsuites/sptests/Makefile.am
@@ -19,7 +19,7 @@ SUBDIRS = \
     spfatal01 spfatal02 spfatal03 spfatal04 spfatal05 spfatal06 spfatal07 \
     spfatal08 spfatal09 spfatal10 spfatal11 spfatal12 \
     spintrcritical01 spintrcritical02 spintrcritical03 spintrcritical04 \
-    spintrcritical05 spintrcritical06
+    spintrcritical05 spintrcritical06 spintrcritical07
  
 DIST_SUBDIRS = $(SUBDIRS) spfatal_support spintrcritical_support
 EXTRA_DIST = spfatal_support/init.c spfatal_support/system.h
diff --git a/testsuites/sptests/configure.ac b/testsuites/sptests/configure.ac
index dc68f83cc2..d505ff4fdc 100644
--- a/testsuites/sptests/configure.ac
+++ b/testsuites/sptests/configure.ac
@@ -104,6 +104,7 @@ spintrcritical03/Makefile
 spintrcritical04/Makefile
 spintrcritical05/Makefile
 spintrcritical06/Makefile
+spintrcritical07/Makefile
 spobjgetnext/Makefile
 spprintk/Makefile
 spsize/Makefile
diff --git a/testsuites/sptests/spintrcritical06/init.c b/testsuites/sptests/spintrcritical06/init.c
index e00ff2168d..0284b27a5f 100644
--- a/testsuites/sptests/spintrcritical06/init.c
+++ b/testsuites/sptests/spintrcritical06/init.c
@@ -73,6 +73,11 @@ rtems_task Secondary_task(
   if ( arg )
     (void) rtems_semaphore_flush( Semaphore );
 
+  #if defined(PRIORITY_NO_TIMEOUT_REVERSE)
+    status = rtems_task_resume( Main_task );
+    directive_failed( status, "rtems_task_resume" );
+  #endif
+
   status = rtems_semaphore_obtain(
     Semaphore,
     RTEMS_DEFAULT_OPTIONS,
@@ -121,6 +126,10 @@ rtems_task Init(
   for (resets=0 ; resets< 2 ;) {
     if ( interrupt_critical_section_test_support_delay() )
       resets++;
+    #if defined(PRIORITY_NO_TIMEOUT_REVERSE)
+      status = rtems_task_suspend( RTEMS_SELF );
+      directive_failed( status, "rtems_task_suspend" );
+    #endif
 
     status = rtems_semaphore_obtain(
       Semaphore,
diff --git a/testsuites/sptests/spintrcritical07/.cvsignore b/testsuites/sptests/spintrcritical07/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/testsuites/sptests/spintrcritical07/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/testsuites/sptests/spintrcritical07/Makefile.am b/testsuites/sptests/spintrcritical07/Makefile.am
new file mode 100644
index 0000000000..a9235c9521
--- /dev/null
+++ b/testsuites/sptests/spintrcritical07/Makefile.am
@@ -0,0 +1,31 @@
+##
+## $Id$
+##
+
+MANAGERS = all
+
+rtems_tests_PROGRAMS = spintrcritical07
+spintrcritical07_SOURCES = ../spintrcritical06/init.c \
+    ../spintrcritical_support/intrcritical.c
+
+dist_rtems_tests_DATA = spintrcritical07.scn
+dist_rtems_tests_DATA += spintrcritical07.doc
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
+
+spintrcritical07_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+
+AM_CPPFLAGS += -I$(top_srcdir)/../support/include
+AM_CPPFLAGS += -I$(top_srcdir)/spintrcritical_support
+AM_CPPFLAGS += -DPRIORITY_NO_TIMEOUT_REVERSE
+
+LINK_OBJS = $(spintrcritical07_OBJECTS) $(spintrcritical07_LDADD)
+LINK_LIBS = $(spintrcritical07_LDLIBS)
+
+spintrcritical07$(EXEEXT): $(spintrcritical07_OBJECTS) $(spintrcritical07_DEPENDENCIES)
+	@rm -f spintrcritical07$(EXEEXT)
+	$(make-exe)
+
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/spintrcritical07/spintrcritical07.doc b/testsuites/sptests/spintrcritical07/spintrcritical07.doc
new file mode 100644
index 0000000000..cf0184b578
--- /dev/null
+++ b/testsuites/sptests/spintrcritical07/spintrcritical07.doc
@@ -0,0 +1,31 @@
+#
+#  $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:  spintrcritical07
+
+directives:
+
+  _Thread_queue_Enqueue_priority
+    - interrupt synchronization
+  rtems_task_restart
+  _Thread_queue_Extract_priority
+
+concepts:
+
++ Ensure that removing the "search task" from the thread queue while we
+  are looping and enqueuing another works as expected.  This case is where
+  the TCB we are using as a current pointer is removed from the thread queue
+  when we flash interrupts WHILE SEARCHING FORWARD.
+
+NOTE: There is no way to know this case is hit from a test perspective.  The
+      test just runs and we check the coverage report.
diff --git a/testsuites/sptests/spintrcritical07/spintrcritical07.scn b/testsuites/sptests/spintrcritical07/spintrcritical07.scn
new file mode 100644
index 0000000000..95953f8a9e
--- /dev/null
+++ b/testsuites/sptests/spintrcritical07/spintrcritical07.scn
@@ -0,0 +1,5 @@
+*** TEST INTERRUPT CRITICAL SECTION 07 ***
+Init - Trying to generate semaphore release from ISR while blocking
+Init - Variation is: Priority/Without Timeout/Multiple Tasks (Forward)
+Support - rtems_timer_create - creating timer 1
+*** END OF TEST INTERRUPT CRITICAL SECTION 07 ***