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.

5 files changed, 207 insertions, 0 deletions

diff --git a/testsuites/sptests/spintrcritical01/.cvsignore b/testsuites/sptests/spintrcritical01/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/testsuites/sptests/spintrcritical01/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/testsuites/sptests/spintrcritical01/Makefile.am b/testsuites/sptests/spintrcritical01/Makefile.am
new file mode 100644
index 0000000000..2d1206a910
--- /dev/null
+++ b/testsuites/sptests/spintrcritical01/Makefile.am
@@ -0,0 +1,30 @@
+##
+## $Id$
+##
+
+MANAGERS = all
+
+rtems_tests_PROGRAMS = spintrcritical01
+spintrcritical01_SOURCES = init.c ../spintrcritical_support/intrcritical.c
+
+dist_rtems_tests_DATA = spintrcritical01.scn
+dist_rtems_tests_DATA += spintrcritical01.doc
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
+
+spintrcritical01_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_NO_TIMEOUT
+
+LINK_OBJS = $(spintrcritical01_OBJECTS) $(spintrcritical01_LDADD)
+LINK_LIBS = $(spintrcritical01_LDLIBS)
+
+spintrcritical01$(EXEEXT): $(spintrcritical01_OBJECTS) $(spintrcritical01_DEPENDENCIES)
+	@rm -f spintrcritical01$(EXEEXT)
+	$(make-exe)
+
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/spintrcritical01/init.c b/testsuites/sptests/spintrcritical01/init.c
new file mode 100644
index 0000000000..7b888c19b3
--- /dev/null
+++ b/testsuites/sptests/spintrcritical01/init.c
@@ -0,0 +1,144 @@
+/*
+ *  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>
+
+#if defined(FIFO_NO_TIMEOUT)
+  #define TEST_NAME                "01"
+  #define TEST_STRING              "FIFO/Without Timeout"
+  #define SEMAPHORE_OBTAIN_TIMEOUT 0
+  #define SEMAPHORE_ATTRIBUTES     RTEMS_DEFAULT_ATTRIBUTES
+
+#elif defined(FIFO_WITH_TIMEOUT)
+  #define TEST_NAME                "02"
+  #define TEST_STRING              "FIFO/With Timeout"
+  #define SEMAPHORE_OBTAIN_TIMEOUT 10
+  #define SEMAPHORE_ATTRIBUTES     RTEMS_DEFAULT_ATTRIBUTES
+
+#elif defined(PRIORITY_NO_TIMEOUT)
+  #define TEST_NAME                "03"
+  #define TEST_STRING              "Priority/Without Timeout"
+  #define SEMAPHORE_OBTAIN_TIMEOUT 0
+  #define SEMAPHORE_ATTRIBUTES     RTEMS_PRIORITY
+
+#elif defined(PRIORITY_WITH_TIMEOUT)
+  #define TEST_NAME                "04"
+  #define TEST_STRING              "Priority/With Timeout"
+  #define SEMAPHORE_OBTAIN_TIMEOUT 10
+  #define SEMAPHORE_ATTRIBUTES     RTEMS_PRIORITY
+
+#elif defined(PRIORITY_NO_TIMEOUT_REVERSE)
+  #define TEST_NAME                "05"
+  #define TEST_STRING              "Priority/Without Timeout (Reverse)"
+  #define SEMAPHORE_OBTAIN_TIMEOUT 0
+  #define SEMAPHORE_ATTRIBUTES     RTEMS_PRIORITY
+
+#else
+
+  #error "Test Mode not defined"
+#endif
+
+rtems_id Main_task;
+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
+)
+{
+  rtems_status_code     status;
+
+  if ( getState() == THREAD_BLOCKING_OPERATION_NOTHING_HAPPENED ) {
+    case_hit = true;
+  }
+  status = rtems_semaphore_release( Semaphore );
+}
+
+
+
+rtems_task Init(
+  rtems_task_argument ignored
+)
+{
+  rtems_status_code     status;
+
+  puts( "\n\n*** TEST INTERRUPT CRITICAL SECTION " TEST_NAME " ***" );
+
+  puts( "Init - Trying to generate semaphore release from ISR while blocking" );
+  puts( "Init - Variation is: " TEST_STRING );
+  status = rtems_semaphore_create(
+    rtems_build_name( 'S', 'M', '1', ' ' ),
+    1,
+    SEMAPHORE_ATTRIBUTES,
+    RTEMS_NO_PRIORITY,
+    &Semaphore
+  );
+  directive_failed( status, "rtems_semaphore_create of SM1" );
+
+  Main_task = rtems_task_self();
+
+  interrupt_critical_section_test_support_initialize( test_release_from_isr );
+
+  case_hit = false;
+
+  while (!case_hit) {
+    interrupt_critical_section_test_support_delay();
+
+    status = rtems_semaphore_obtain(
+      Semaphore,
+      RTEMS_DEFAULT_OPTIONS,
+      SEMAPHORE_OBTAIN_TIMEOUT
+    );
+    directive_failed( status, "rtems_semaphore_obtain" );
+  }
+
+  puts( "Init - Case hit" );
+
+  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       1
+#define CONFIGURE_MAXIMUM_TIMERS      1
+#define CONFIGURE_MAXIMUM_SEMAPHORES  1
+#if defined(PRIORITY_NO_TIMEOUT_REVERSE)
+  #define CONFIGURE_INIT_TASK_PRIORITY   250
+#endif
+#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
+
+#define CONFIGURE_INIT
+#include <rtems/confdefs.h>
+
+/* global variables */
diff --git a/testsuites/sptests/spintrcritical01/spintrcritical01.doc b/testsuites/sptests/spintrcritical01/spintrcritical01.doc
new file mode 100644
index 0000000000..aa63cbcb03
--- /dev/null
+++ b/testsuites/sptests/spintrcritical01/spintrcritical01.doc
@@ -0,0 +1,25 @@
+#
+#  $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:  spintrcritical01
+
+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.
diff --git a/testsuites/sptests/spintrcritical01/spintrcritical01.scn b/testsuites/sptests/spintrcritical01/spintrcritical01.scn
new file mode 100644
index 0000000000..cb51f99ae7
--- /dev/null
+++ b/testsuites/sptests/spintrcritical01/spintrcritical01.scn
@@ -0,0 +1,6 @@
+*** TEST INTERRUPT CRITICAL SECTION 01 ***
+Init - Trying to generate semaphore release from ISR while blocking
+Init - Variation is: FIFO/Without Timeout
+Support - rtems_timer_create - creating timer 1
+Init - Case hit
+*** END OF TEST INTERRUPT CRITICAL SECTION 01 ***