2010-07-26 Joel Sherrill <joel.sherrill@oarcorp.com>

	* Makefile.am, configure.ac: Add test to extract a task blocked with
	timeout on a priority ordered thread queue.
	* sp72/.cvsignore, sp72/Makefile.am, sp72/init.c, sp72/sp72.doc,
	sp72/sp72.scn: New files.

8 files changed, 154 insertions, 1 deletions

diff --git a/testsuites/sptests/ChangeLog b/testsuites/sptests/ChangeLog
index 055ac106f4..9e255ea04f 100644
--- a/testsuites/sptests/ChangeLog
+++ b/testsuites/sptests/ChangeLog
@@ -1,3 +1,10 @@
+2010-07-26	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* Makefile.am, configure.ac: Add test to extract a task blocked with
+	timeout on a priority ordered thread queue.
+	* sp72/.cvsignore, sp72/Makefile.am, sp72/init.c, sp72/sp72.doc,
+	sp72/sp72.scn: New files.
+
 2010-07-16	Bharath Suri <bharath.s.jois@gmail.com>
 
 	PR 1617/testing
diff --git a/testsuites/sptests/Makefile.am b/testsuites/sptests/Makefile.am
index 42ddec6efb..5de78b9143 100644
--- a/testsuites/sptests/Makefile.am
+++ b/testsuites/sptests/Makefile.am
@@ -14,7 +14,7 @@ SUBDIRS = \
     sp40 sp41 sp42 sp43 sp44 sp45 sp46 sp47 sp48 sp49 \
     sp50 sp51 sp52 sp53 sp54 sp55 sp56 sp57 sp58 sp59 \
     sp60 sp61 sp62 sp63 sp64 sp65 sp66 sp67 sp68 sp69 \
-    sp70 sp71 \
+    sp70 sp71 sp72 \
     spassoc01 spchain spclockget spcoverage spobjgetnext \
     spnotepad01 spprintk spsize spstkalloc spthreadq01 \
     spwatchdog spwkspace \
diff --git a/testsuites/sptests/configure.ac b/testsuites/sptests/configure.ac
index d6b622a7e7..8f1dfa9655 100644
--- a/testsuites/sptests/configure.ac
+++ b/testsuites/sptests/configure.ac
@@ -97,6 +97,7 @@ sp68/Makefile
 sp69/Makefile
 sp70/Makefile
 sp71/Makefile
+sp72/Makefile
 spassoc01/Makefile
 spchain/Makefile
 spclockget/Makefile
diff --git a/testsuites/sptests/sp72/.cvsignore b/testsuites/sptests/sp72/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/testsuites/sptests/sp72/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/testsuites/sptests/sp72/Makefile.am b/testsuites/sptests/sp72/Makefile.am
new file mode 100644
index 0000000000..24e1b5dcef
--- /dev/null
+++ b/testsuites/sptests/sp72/Makefile.am
@@ -0,0 +1,26 @@
+##
+## $Id$
+##
+
+MANAGERS = all
+
+rtems_tests_PROGRAMS = sp72
+sp72_SOURCES = init.c
+
+dist_rtems_tests_DATA = sp72.scn
+dist_rtems_tests_DATA += sp72.doc
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
+
+AM_CPPFLAGS += -I$(top_srcdir)/../support/include
+
+LINK_OBJS = $(sp72_OBJECTS) $(sp72_LDADD)
+LINK_LIBS = $(sp72_LDLIBS)
+
+sp72$(EXEEXT): $(sp72_OBJECTS) $(sp72_DEPENDENCIES)
+	@rm -f sp72$(EXEEXT)
+	$(make-exe)
+
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp72/init.c b/testsuites/sptests/sp72/init.c
new file mode 100644
index 0000000000..46e290a42f
--- /dev/null
+++ b/testsuites/sptests/sp72/init.c
@@ -0,0 +1,87 @@
+/*
+ *  COPYRIGHT (c) 1989-2010.
+ *  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 "test_support.h"
+
+rtems_id Semaphore_id;
+
+rtems_task Test_task(
+  rtems_task_argument argument
+)
+{
+  rtems_status_code status;
+
+  puts( "Task - rtems_semaphore_obtain - wait w/timeout " );
+  status = rtems_semaphore_obtain(
+    Semaphore_id,
+    RTEMS_DEFAULT_OPTIONS,
+    rtems_clock_get_ticks_per_second() * 10
+  );
+}
+
+rtems_task Init(
+  rtems_task_argument argument
+)
+{
+  rtems_status_code status;
+  rtems_id          task_id;
+
+  puts( "\n\n*** TEST SP72 ***" );
+
+  status = rtems_semaphore_create(
+    rtems_build_name( 'S', 'M', '1', ' ' ),
+    0,
+    RTEMS_PRIORITY,
+    0,
+    &Semaphore_id
+  );
+  directive_failed( status, "rtems_semaphore_create - priority blocking" );
+
+  status = rtems_task_create(
+    rtems_build_name( 'T', 'E', 'S', 'T' ),
+    1,
+    RTEMS_MINIMUM_STACK_SIZE,
+    RTEMS_DEFAULT_MODES,
+    RTEMS_DEFAULT_ATTRIBUTES,
+    &task_id
+  );
+  directive_failed( status, "rtems_task_create" );
+  
+  status = rtems_task_start( task_id, Test_task, 0 );
+  directive_failed( status, "rtems_task_start" );
+
+  puts( "Init - sleep 1 second" );
+  status = rtems_task_wake_after( rtems_clock_get_ticks_per_second() );
+  directive_failed( status, "rtems_task_wake_after" );
+
+  puts( "Init - rtems_task_delete - to extract priority w/timeout" );
+  status = rtems_task_delete( task_id );
+  directive_failed( status, "rtems_task_delete" );
+
+  puts( "*** END OF TEST SP72 ***" );
+
+  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_SEMAPHORES        1
+#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
+
+#define CONFIGURE_INIT
+
+#include <rtems/confdefs.h>
+/* end of file */
diff --git a/testsuites/sptests/sp72/sp72.doc b/testsuites/sptests/sp72/sp72.doc
new file mode 100644
index 0000000000..99aac50701
--- /dev/null
+++ b/testsuites/sptests/sp72/sp72.doc
@@ -0,0 +1,25 @@
+#
+#  $Id$
+#
+#  COPYRIGHT (c) 1989-2010.
+#  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:  sp72
+
+directives:
+
+  rtems_semaphore_create
+  rtems_semaphore_obtain
+  rtems_task_delete
+
+concepts:
+
++ Block with timeout on a semaphore with priority ordered blocking.
+Delete the task so it has to be extracted.
diff --git a/testsuites/sptests/sp72/sp72.scn b/testsuites/sptests/sp72/sp72.scn
new file mode 100644
index 0000000000..89463af354
--- /dev/null
+++ b/testsuites/sptests/sp72/sp72.scn
@@ -0,0 +1,5 @@
+*** TEST SP72 ***
+Init - sleep 1 second
+Task - rtems_semaphore_obtain - wait w/timeout 
+Init - rtems_task_delete - to extract priority w/timeout
+*** END OF TEST SP72 ***