2010-07-29 Bharath Suri <bharath.s.jois@gmail.com>

	PR 1621/testing
	* Makefile.am, configure.ac: Improve coverage of private environment.
	* spprivenv01/.cvsignore, spprivenv01/Makefile.am, spprivenv01/init.c,
	spprivenv01/spprivenv01.doc, spprivenv01/spprivenv01.scn: New files.

8 files changed, 209 insertions, 1 deletions

diff --git a/testsuites/sptests/ChangeLog b/testsuites/sptests/ChangeLog
index 54e6e803fd..a75ae3e170 100644
--- a/testsuites/sptests/ChangeLog
+++ b/testsuites/sptests/ChangeLog
@@ -1,3 +1,10 @@
+2010-07-29	Bharath Suri <bharath.s.jois@gmail.com>
+
+	PR 1621/testing
+	* Makefile.am, configure.ac: Improve coverage of private environment.
+	* spprivenv01/.cvsignore, spprivenv01/Makefile.am, spprivenv01/init.c,
+	spprivenv01/spprivenv01.doc, spprivenv01/spprivenv01.scn: New files.
+
 2010-07-27	Joel Sherrill <joel.sherrilL@OARcorp.com>
 
 	* sp43/init.c, sp43/sp43.scn: Add code to exercise case where an API
diff --git a/testsuites/sptests/Makefile.am b/testsuites/sptests/Makefile.am
index 5de78b9143..655ac4b84c 100644
--- a/testsuites/sptests/Makefile.am
+++ b/testsuites/sptests/Makefile.am
@@ -16,7 +16,7 @@ SUBDIRS = \
     sp60 sp61 sp62 sp63 sp64 sp65 sp66 sp67 sp68 sp69 \
     sp70 sp71 sp72 \
     spassoc01 spchain spclockget spcoverage spobjgetnext \
-    spnotepad01 spprintk spsize spstkalloc spthreadq01 \
+    spnotepad01 spprintk spprivenv01 spsize spstkalloc spthreadq01 \
     spwatchdog spwkspace \
     sperror01 sperror02 sperror03 \
     spfatal01 spfatal02 spfatal03 spfatal04 spfatal05 spfatal06 spfatal07 \
diff --git a/testsuites/sptests/configure.ac b/testsuites/sptests/configure.ac
index 8f1dfa9655..f5c5c0756f 100644
--- a/testsuites/sptests/configure.ac
+++ b/testsuites/sptests/configure.ac
@@ -154,6 +154,7 @@ spmountmgr01/Makefile
 spnotepad01/Makefile
 spobjgetnext/Makefile
 spprintk/Makefile
+spprivenv01/Makefile
 spsize/Makefile
 spstkalloc/Makefile
 spthreadq01/Makefile
diff --git a/testsuites/sptests/spprivenv01/.cvsignore b/testsuites/sptests/spprivenv01/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/testsuites/sptests/spprivenv01/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/testsuites/sptests/spprivenv01/Makefile.am b/testsuites/sptests/spprivenv01/Makefile.am
new file mode 100644
index 0000000000..33b5ccc2e5
--- /dev/null
+++ b/testsuites/sptests/spprivenv01/Makefile.am
@@ -0,0 +1,24 @@
+##
+## $Id$
+##
+
+rtems_tests_PROGRAMS = spprivenv01
+spprivenv01_SOURCES = init.c
+
+dist_rtems_tests_DATA = spprivenv01.scn
+dist_rtems_tests_DATA += spprivenv01.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 = $(spprivenv01_OBJECTS) $(spprivenv01_LDADD)
+LINK_LIBS = $(spprivenv01_LDLIBS)
+
+spprivenv01$(EXEEXT): $(spprivenv01_OBJECTS) $(spprivenv01_DEPENDENCIES)
+	@rm -f spprivenv01$(EXEEXT)
+	$(make-exe)
+
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/spprivenv01/init.c b/testsuites/sptests/spprivenv01/init.c
new file mode 100644
index 0000000000..3752088bd8
--- /dev/null
+++ b/testsuites/sptests/spprivenv01/init.c
@@ -0,0 +1,132 @@
+/*
+ *  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"
+#include <rtems/score/heap.h>
+#include <rtems/libio_.h>
+
+extern Heap_Control  *RTEMS_Malloc_Heap;
+
+rtems_task task_routine( rtems_task_argument not_used )
+{
+  int sc = 0;
+
+  puts( "task_routine - setting up a private environment" );
+
+  sc = rtems_libio_set_private_env();
+  sleep( 1 );
+
+  rtems_task_delete( RTEMS_SELF );
+}
+
+rtems_task Init(
+  rtems_task_argument argument
+)
+{
+  int sc = 0;
+  bool status = 0;
+  void *alloc_ptr = (void *)0;
+  Heap_Information_block Info;
+  rtems_id current_task_id;
+  rtems_id task_id;
+  rtems_name another_task_name;
+
+  puts( "\n\n*** TEST USER ENVIRONMENT ROUTINE - 01 ***" );
+
+  puts( "Init - allocating most of heap -- OK" );
+  _Heap_Get_information(RTEMS_Malloc_Heap, &Info);
+  alloc_ptr = malloc( Info.Free.largest - 4 );
+  rtems_test_assert( alloc_ptr != NULL );
+
+  puts( "Init - attempt to reset env - expect RTEMS_NO_MEMORY" );
+  sc = rtems_libio_set_private_env();
+  rtems_test_assert( sc == RTEMS_NO_MEMORY );
+
+  puts( "Init - freeing the allocated memory" );
+  free( alloc_ptr );
+
+  puts( "Init - allocating most of workspace memory" );
+  status = rtems_workspace_get_information( &Info );
+  rtems_test_assert( status == true );
+  status = rtems_workspace_allocate( Info.Free.largest - 4, &alloc_ptr );
+  rtems_test_assert( status == true );
+  
+  puts( "Init - attempt to reset env - expect RTEMS_NO_MEMORY" );
+  sc = rtems_libio_set_private_env();
+  rtems_test_assert( sc == RTEMS_NO_MEMORY );
+
+  puts( "Init - freeing the workspace memory" );
+  status = rtems_workspace_free( alloc_ptr );
+  rtems_test_assert( status == true );
+
+  puts( "Init - creating a task name and a task -- OK" );
+
+  another_task_name = 
+    rtems_build_name( 'T','S','K','D' );
+
+  sc = rtems_task_create( another_task_name,
+			  1,
+			  RTEMS_MINIMUM_STACK_SIZE * 2,
+			  RTEMS_INTERRUPT_LEVEL(31),
+			  RTEMS_DEFAULT_ATTRIBUTES,
+			  &task_id
+			  );
+
+  puts( "Init - starting the task_routine, to set its private environment" );
+  status = rtems_task_start( task_id, task_routine, 0);
+  rtems_test_assert(status == 0);
+
+  puts( "Init - attempt to share the env with another task -- Expect error" );
+  sc = rtems_libio_share_private_env( task_id );
+  rtems_test_assert( sc == RTEMS_INVALID_ADDRESS );
+
+  sleep( 1 );
+
+  puts( "Init - attempt to share the env with another task -- OK" );
+  sc = rtems_libio_share_private_env( task_id );
+  rtems_test_assert( sc == RTEMS_SUCCESSFUL );
+  rtems_test_assert( rtems_current_user_env->task_id == task_id );
+
+  puts( "Init - Get current task id" );
+  current_task_id = rtems_task_self();
+
+  puts( "Init - Attempt to reset current task's environment" );
+  sc = rtems_libio_set_private_env();
+  rtems_test_assert( sc == RTEMS_SUCCESSFUL );
+  rtems_test_assert( rtems_current_user_env->task_id == current_task_id );
+  
+  puts( "Init - attempt to share the env with another task -- OK" );
+  sc = rtems_libio_share_private_env( task_id );
+  rtems_test_assert( sc == RTEMS_SUCCESSFUL );
+  rtems_test_assert( rtems_current_user_env->task_id == task_id );
+
+  puts( "Init - attempt to share with self -- OK" );
+  sc = rtems_libio_share_private_env( task_id );
+  rtems_test_assert( sc == RTEMS_SUCCESSFUL );
+
+  puts( "*** END OF TEST USER ENVIRONMENT ROUTINE - 01 ***" );
+
+  rtems_test_exit(0);
+}
+
+/* configuration information */
+
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+
+#define CONFIGURE_MAXIMUM_TASKS             3
+#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
+
+#define CONFIGURE_INIT
+
+#include <rtems/confdefs.h>
+/* end of file */
diff --git a/testsuites/sptests/spprivenv01/spprivenv01.doc b/testsuites/sptests/spprivenv01/spprivenv01.doc
new file mode 100644
index 0000000000..c36254d1ee
--- /dev/null
+++ b/testsuites/sptests/spprivenv01/spprivenv01.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:  spprivenv01
+
+directives:
+
+  + rtems_libio_set_private_env
+  + rtems_libio_share_private_env
+
+concepts:
+
++ Exercise the routines at privateenv.c, which reset/share a task's
+private environment
+
diff --git a/testsuites/sptests/spprivenv01/spprivenv01.scn b/testsuites/sptests/spprivenv01/spprivenv01.scn
new file mode 100644
index 0000000000..b95832ced2
--- /dev/null
+++ b/testsuites/sptests/spprivenv01/spprivenv01.scn
@@ -0,0 +1,17 @@
+*** TEST USER ENVIRONMENT ROUTINE - 01 ***
+Init - allocating most of heap -- OK
+Init - attempt to reset env - expect RTEMS_NO_MEMORY
+Init - freeing the allocated memory
+Init - allocating most of workspace memory
+Init - attempt to reset env - expect RTEMS_NO_MEMORY
+Init - freeing the workspace memory
+Init - creating a task name and a task -- OK
+Init - starting the task_routine, to set its private environment
+Init - attempt to share the env with another task -- Expect error
+task_routine - setting up a private environment
+Init - attempt to share the env with another task -- OK
+Init - Get current task id
+Init - Attempt to reset current task's environment
+Init - attempt to share the env with another task -- OK
+Init - attempt to share with self -- OK
+*** END OF TEST USER ENVIRONMENT ROUTINE - 01 ***