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

	* Makefile.am, configure.ac: Add new infrastructure which is more
	reliable about generating cases which hit interrupt critical
	sections. Remove sp41 since it used its own mechanism.
	* spintrcritical01/.cvsignore, spintrcritical01/Makefile.am,
	spintrcritical01/init.c, spintrcritical01/spintrcritical01.doc,
	spintrcritical01/spintrcritical01.scn, spintrcritical02/.cvsignore,
	spintrcritical02/Makefile.am, spintrcritical02/spintrcritical02.doc,
	spintrcritical02/spintrcritical02.scn, spintrcritical03/.cvsignore,
	spintrcritical03/Makefile.am, spintrcritical03/spintrcritical03.doc,
	spintrcritical03/spintrcritical03.scn, spintrcritical04/.cvsignore,
	spintrcritical04/Makefile.am, spintrcritical04/spintrcritical04.doc,
	spintrcritical04/spintrcritical04.scn, spintrcritical05/.cvsignore,
	spintrcritical05/Makefile.am, spintrcritical05/spintrcritical05.doc,
	spintrcritical05/spintrcritical05.scn: New files.
	* sp41/.cvsignore, sp41/Makefile.am, sp41/init.c, sp41/sp41.scn,
	sp41/system.h: Removed.

4 files changed, 65 insertions, 0 deletions

diff --git a/testsuites/sptests/spintrcritical02/.cvsignore b/testsuites/sptests/spintrcritical02/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/testsuites/sptests/spintrcritical02/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/testsuites/sptests/spintrcritical02/Makefile.am b/testsuites/sptests/spintrcritical02/Makefile.am
new file mode 100644
index 0000000000..8c640ec701
--- /dev/null
+++ b/testsuites/sptests/spintrcritical02/Makefile.am
@@ -0,0 +1,31 @@
+##
+## $Id$
+##
+
+MANAGERS = all
+
+rtems_tests_PROGRAMS = spintrcritical02
+spintrcritical02_SOURCES = ../spintrcritical01/init.c \
+    ../spintrcritical_support/intrcritical.c
+
+dist_rtems_tests_DATA = spintrcritical02.scn
+dist_rtems_tests_DATA += spintrcritical02.doc
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
+
+spintrcritical02_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+
+AM_CPPFLAGS += -I$(top_srcdir)/../support/include
+AM_CPPFLAGS += -I$(top_srcdir)/spintrcritical_support
+AM_CPPFLAGS += -DFIFO_WITH_TIMEOUT
+
+LINK_OBJS = $(spintrcritical02_OBJECTS) $(spintrcritical02_LDADD)
+LINK_LIBS = $(spintrcritical02_LDLIBS)
+
+spintrcritical02$(EXEEXT): $(spintrcritical02_OBJECTS) $(spintrcritical02_DEPENDENCIES)
+	@rm -f spintrcritical02$(EXEEXT)
+	$(make-exe)
+
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/spintrcritical02/spintrcritical02.doc b/testsuites/sptests/spintrcritical02/spintrcritical02.doc
new file mode 100644
index 0000000000..182e010fe8
--- /dev/null
+++ b/testsuites/sptests/spintrcritical02/spintrcritical02.doc
@@ -0,0 +1,26 @@
+#
+#  $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:  spintrcritical02
+
+directives:
+
+  _Thread_queue_Enqueue_fifo
+  _Thread_queue_Dequeue_fifo
+    - interrupt synchronization
+
+concepts:
+
++ Ensure that unblocking a task from an ISR while the task is in the process
+  of blocking on a thread queue works as expected.  This test adds that the
+  blocking operation has a timeout option.
diff --git a/testsuites/sptests/spintrcritical02/spintrcritical02.scn b/testsuites/sptests/spintrcritical02/spintrcritical02.scn
new file mode 100644
index 0000000000..ed16ba3f43
--- /dev/null
+++ b/testsuites/sptests/spintrcritical02/spintrcritical02.scn
@@ -0,0 +1,6 @@
+*** TEST INTERRUPT CRITICAL SECTION 02 ***
+Init - Trying to generate semaphore release from ISR while blocking
+Init - Variation is: FIFO/With Timeout
+Support - rtems_timer_create - creating timer 1
+Init - Case hit
+*** END OF TEST INTERRUPT CRITICAL SECTION 02 ***