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

	* Makefile.am, configure.ac, sp39/init.c, sp39/sp39.scn: Move
	unreliable third case in sp39 to spintrcritical10. New tests to hit
	other event synchronization critical sections.
	* spintrcritical11/.cvsignore, spintrcritical11/Makefile.am,
	spintrcritical11/init.c, spintrcritical11/spintrcritical11.doc,
	spintrcritical11/spintrcritical11.scn, spintrcritical12/.cvsignore,
	spintrcritical12/Makefile.am, spintrcritical12/spintrcritical12.doc,
	spintrcritical12/spintrcritical12.scn: New files.

14 files changed, 239 insertions, 44 deletions

diff --git a/testsuites/sptests/ChangeLog b/testsuites/sptests/ChangeLog
index 208672eb8f..3631f689a1 100644
--- a/testsuites/sptests/ChangeLog
+++ b/testsuites/sptests/ChangeLog
@@ -1,5 +1,16 @@
 2009-07-21	Joel Sherrill <joel.sherrill@OARcorp.com>
 
+	* Makefile.am, configure.ac, sp39/init.c, sp39/sp39.scn: Move
+	unreliable third case in sp39 to spintrcritical10. New tests to hit
+	other event synchronization critical sections.
+	* spintrcritical11/.cvsignore, spintrcritical11/Makefile.am,
+	spintrcritical11/init.c, spintrcritical11/spintrcritical11.doc,
+	spintrcritical11/spintrcritical11.scn, spintrcritical12/.cvsignore,
+	spintrcritical12/Makefile.am, spintrcritical12/spintrcritical12.doc,
+	spintrcritical12/spintrcritical12.scn: New files.
+
+2009-07-21	Joel Sherrill <joel.sherrill@OARcorp.com>
+
 	* Makefile.am, configure.ac: Add new test to exercise Debug Manager.
 	* sp10/.cvsignore, sp10/Makefile.am, sp10/init.c, sp10/sp10.doc,
 	sp10/sp10.scn: New files.
diff --git a/testsuites/sptests/Makefile.am b/testsuites/sptests/Makefile.am
index e65b241b84..a34c229c2c 100644
--- a/testsuites/sptests/Makefile.am
+++ b/testsuites/sptests/Makefile.am
@@ -20,7 +20,7 @@ SUBDIRS = \
     spfatal08 spfatal09 spfatal10 spfatal11 spfatal12 \
     spintrcritical01 spintrcritical02 spintrcritical03 spintrcritical04 \
     spintrcritical05 spintrcritical06 spintrcritical07 spintrcritical08 \
-    spintrcritical09
+    spintrcritical09 spintrcritical10 spintrcritical11 spintrcritical12
  
 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 e13234b499..f09c252245 100644
--- a/testsuites/sptests/configure.ac
+++ b/testsuites/sptests/configure.ac
@@ -108,6 +108,9 @@ spintrcritical06/Makefile
 spintrcritical07/Makefile
 spintrcritical08/Makefile
 spintrcritical09/Makefile
+spintrcritical10/Makefile
+spintrcritical11/Makefile
+spintrcritical12/Makefile
 spobjgetnext/Makefile
 spprintk/Makefile
 spsize/Makefile
diff --git a/testsuites/sptests/sp39/init.c b/testsuites/sptests/sp39/init.c
index fb89137583..8d4abb1ffd 100644
--- a/testsuites/sptests/sp39/init.c
+++ b/testsuites/sptests/sp39/init.c
@@ -92,12 +92,12 @@ rtems_task Init(
   directive_failed( status, "rtems_timer_create" );
 
   status = rtems_task_create(
-     0xa5a5a5a5,
-     1,
-     RTEMS_MINIMUM_STACK_SIZE,
-     RTEMS_DEFAULT_MODES,
-     RTEMS_DEFAULT_ATTRIBUTES,
-     &other_task
+    0xa5a5a5a5,
+    1,
+    RTEMS_MINIMUM_STACK_SIZE,
+    RTEMS_DEFAULT_MODES,
+    RTEMS_DEFAULT_ATTRIBUTES,
+    &other_task
   );
   directive_failed( status, "rtems_task_create" );
 
@@ -129,9 +129,9 @@ rtems_task Init(
       break;
   }
 
-   printf(
-     "Event sent from ISR hitting synchronization point has %soccurred\n",
-     (( case_hit == TRUE ) ? "" : "NOT ")
+  printf(
+    "Event sent from ISR hitting synchronization point has %soccurred\n",
+    (( case_hit == TRUE ) ? "" : "NOT ")
   ); 
 
   /*
@@ -163,40 +163,12 @@ rtems_task Init(
       break;
   }
 
-   printf(
-     "Event sent from ISR (with timeout) hitting synchronization "
-       "point has %soccurred\n",
-     (( case_hit == TRUE ) ? "" : "NOT ")
+  printf(
+    "Event sent from ISR (with timeout) hitting synchronization "
+      "point has %soccurred\n",
+    (( case_hit == TRUE ) ? "" : "NOT ")
   ); 
 
-  /*
-   *  Now try for a timeout case
-   */
-  iterations = 0;
-  case_hit = FALSE;
-  max = 1;
-
-  puts(
-    "Run multiple times in attempt to hit event timeout synchronization point"
-  ); 
-  while (1) {
-
-    for (i=0 ; i<max ; i++ )
-      if ( _Event_Sync_state == THREAD_BLOCKING_OPERATION_SATISFIED )
-        break;
-
-    status = rtems_event_receive( 0x01, RTEMS_DEFAULT_OPTIONS, 1, &out );
-    fatal_directive_status( status, RTEMS_TIMEOUT, "event_receive timeout" );
-
-    if ( ++max > 10240 )
-      max = 0;
-
-    /* with our clock tick, this is about 30 seconds */
-    if ( ++iterations >= 4L * 1000L * 30L)
-      break;
-
-  }
-
   puts( "*** END OF TEST 39 ***" );
   rtems_test_exit( 0 );
 }
diff --git a/testsuites/sptests/sp39/sp39.scn b/testsuites/sptests/sp39/sp39.scn
index a2e84a7f4b..3d3ab7446a 100644
--- a/testsuites/sptests/sp39/sp39.scn
+++ b/testsuites/sptests/sp39/sp39.scn
@@ -1,5 +1,3 @@
-
-
 *** TEST 39 ***
 Event sent from ISR hitting synchronization point has occurred
 Event timeout hitting synchronization point has occurred
diff --git a/testsuites/sptests/spintrcritical11/.cvsignore b/testsuites/sptests/spintrcritical11/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/testsuites/sptests/spintrcritical11/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/testsuites/sptests/spintrcritical11/Makefile.am b/testsuites/sptests/spintrcritical11/Makefile.am
new file mode 100644
index 0000000000..28c8d6bcb5
--- /dev/null
+++ b/testsuites/sptests/spintrcritical11/Makefile.am
@@ -0,0 +1,30 @@
+##
+## $Id$
+##
+
+MANAGERS = all
+
+rtems_tests_PROGRAMS = spintrcritical11
+spintrcritical11_SOURCES = init.c ../spintrcritical_support/intrcritical.c
+
+dist_rtems_tests_DATA = spintrcritical11.scn
+dist_rtems_tests_DATA += spintrcritical11.doc
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
+
+spintrcritical11_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+
+AM_CPPFLAGS += -I$(top_srcdir)/../support/include
+AM_CPPFLAGS += -I$(top_srcdir)/spintrcritical_support
+AM_CPPFLAGS += -DEVENT_ANY
+
+LINK_OBJS = $(spintrcritical11_OBJECTS) $(spintrcritical11_LDADD)
+LINK_LIBS = $(spintrcritical11_LDLIBS)
+
+spintrcritical11$(EXEEXT): $(spintrcritical11_OBJECTS) $(spintrcritical11_DEPENDENCIES)
+	@rm -f spintrcritical11$(EXEEXT)
+	$(make-exe)
+
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/spintrcritical11/init.c b/testsuites/sptests/spintrcritical11/init.c
new file mode 100644
index 0000000000..dc2558199d
--- /dev/null
+++ b/testsuites/sptests/spintrcritical11/init.c
@@ -0,0 +1,87 @@
+/*
+ *  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>
+
+rtems_id Main_task;
+
+#if defined(EVENT_ANY)
+  #define TEST_NAME          "11"
+  #define TEST_STRING        "Event Any condition"
+  #define EVENTS_TO_SEND     0x1
+  #define EVENTS_TO_RECEIVE  0x3
+
+#elif defined(EVENT_ALL)
+  #define TEST_NAME          "12"
+  #define TEST_STRING        "Event All condition"
+  #define EVENTS_TO_SEND     0x3
+  #define EVENTS_TO_RECEIVE  0x3
+
+#else
+  #error "Test Mode not defined"
+
+#endif
+
+rtems_timer_service_routine test_release_from_isr(
+  rtems_id  timer,
+  void     *arg
+)
+{
+  (void) rtems_event_send( Main_task, EVENTS_TO_SEND );
+}
+
+rtems_task Init(
+  rtems_task_argument ignored
+)
+{
+  rtems_status_code     sc;
+  rtems_event_set       out;
+  int                   resets;
+
+  puts( "\n\n*** TEST INTERRUPT CRITICAL SECTION " TEST_NAME " ***" );
+
+  puts( "Init - Test may not be able to detect case is hit reliably" );
+  puts( "Init - Trying to generate event send from ISR while blocking" );
+  puts( "Init - Variation is: " TEST_STRING );
+
+  Main_task = rtems_task_self();
+
+  interrupt_critical_section_test_support_initialize( test_release_from_isr );
+
+  for (resets=0 ; resets< 2 ;) {
+    if ( interrupt_critical_section_test_support_delay() )
+      resets++;
+ 
+    interrupt_critical_section_test_support_delay();
+
+    (void) rtems_event_receive( EVENTS_TO_RECEIVE, RTEMS_EVENT_ANY, 1, &out );
+  }
+
+  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_MAXIMUM_SEMAPHORES  1
+#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
+#define CONFIGURE_MICROSECONDS_PER_TICK  1000
+
+#define CONFIGURE_INIT
+#include <rtems/confdefs.h>
+
+/* global variables */
diff --git a/testsuites/sptests/spintrcritical11/spintrcritical11.doc b/testsuites/sptests/spintrcritical11/spintrcritical11.doc
new file mode 100644
index 0000000000..7749632b53
--- /dev/null
+++ b/testsuites/sptests/spintrcritical11/spintrcritical11.doc
@@ -0,0 +1,24 @@
+#
+#  $Id$
+#
+#  COPYRIGHT (c) 1989-2011.
+#  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:  spintrcritical11
+
+directives:
+
+  rtems_event_receive
+  rtems_event_send
+
+concepts:
+
++ Ensure that sending an event to a task that is in the process of blocking
+  works as expected.  This test deals with an Event Any condition.
diff --git a/testsuites/sptests/spintrcritical11/spintrcritical11.scn b/testsuites/sptests/spintrcritical11/spintrcritical11.scn
new file mode 100644
index 0000000000..23fc332b8b
--- /dev/null
+++ b/testsuites/sptests/spintrcritical11/spintrcritical11.scn
@@ -0,0 +1,5 @@
+*** TEST INTERRUPT CRITICAL SECTION 11 ***
+Init - Test may not be able to detect case is hit reliably
+Init - Trying to generate event send from ISR while blocking
+Support - rtems_timer_create - creating timer 1
+*** END OF TEST INTERRUPT CRITICAL SECTION 11 ***
diff --git a/testsuites/sptests/spintrcritical12/.cvsignore b/testsuites/sptests/spintrcritical12/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/testsuites/sptests/spintrcritical12/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/testsuites/sptests/spintrcritical12/Makefile.am b/testsuites/sptests/spintrcritical12/Makefile.am
new file mode 100644
index 0000000000..5f6ac8209a
--- /dev/null
+++ b/testsuites/sptests/spintrcritical12/Makefile.am
@@ -0,0 +1,31 @@
+##
+## $Id$
+##
+
+MANAGERS = all
+
+rtems_tests_PROGRAMS = spintrcritical12
+spintrcritical12_SOURCES = ../spintrcritical11/init.c \
+    ../spintrcritical_support/intrcritical.c
+
+dist_rtems_tests_DATA = spintrcritical12.scn
+dist_rtems_tests_DATA += spintrcritical12.doc
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
+
+spintrcritical12_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+
+AM_CPPFLAGS += -I$(top_srcdir)/../support/include
+AM_CPPFLAGS += -I$(top_srcdir)/spintrcritical_support
+AM_CPPFLAGS += -DEVENT_ALL
+
+LINK_OBJS = $(spintrcritical12_OBJECTS) $(spintrcritical12_LDADD)
+LINK_LIBS = $(spintrcritical12_LDLIBS)
+
+spintrcritical12$(EXEEXT): $(spintrcritical12_OBJECTS) $(spintrcritical12_DEPENDENCIES)
+	@rm -f spintrcritical12$(EXEEXT)
+	$(make-exe)
+
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/spintrcritical12/spintrcritical12.doc b/testsuites/sptests/spintrcritical12/spintrcritical12.doc
new file mode 100644
index 0000000000..2394793d4a
--- /dev/null
+++ b/testsuites/sptests/spintrcritical12/spintrcritical12.doc
@@ -0,0 +1,24 @@
+#
+#  $Id$
+#
+#  COPYRIGHT (c) 1989-2012.
+#  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:  spintrcritical12
+
+directives:
+
+  rtems_event_receive
+  rtems_event_send
+
+concepts:
+
++ Ensure that sending an event to a task that is in the process of blocking
+  works as expected.  This test deals with an Event All condition.
diff --git a/testsuites/sptests/spintrcritical12/spintrcritical12.scn b/testsuites/sptests/spintrcritical12/spintrcritical12.scn
new file mode 100644
index 0000000000..82bcac6d21
--- /dev/null
+++ b/testsuites/sptests/spintrcritical12/spintrcritical12.scn
@@ -0,0 +1,6 @@
+*** TEST INTERRUPT CRITICAL SECTION 11 ***
+Init - Test may not be able to detect case is hit reliably
+Init - Trying to generate event send from ISR while blocking
+Init - Variation is: Event All condition
+Support - rtems_timer_create - creating timer 1
+*** END OF TEST INTERRUPT CRITICAL SECTION 11 ***