2010-08-23 Sebastian Huber <sebastian.huber@embedded-brains.de>

	* gxx01/gxx_wrappers.h, gxx02/.cvsignore, gxx02/Makefile.am,
	gxx02/gxx02.doc, gxx02/gxx02.scn, gxx02/init.c: Removed files.
	* Makefile.am, configure.ac: Reflect changes above.
	* gxx01/init.c: Removed fatal error test case.

10 files changed, 11 insertions, 191 deletions

diff --git a/testsuites/libtests/ChangeLog b/testsuites/libtests/ChangeLog
index c060585c47..9e8504858d 100644
--- a/testsuites/libtests/ChangeLog
+++ b/testsuites/libtests/ChangeLog
@@ -1,3 +1,10 @@
+2010-08-23	Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+	* gxx01/gxx_wrappers.h, gxx02/.cvsignore, gxx02/Makefile.am,
+	gxx02/gxx02.doc, gxx02/gxx02.scn, gxx02/init.c: Removed files.
+	* Makefile.am, configure.ac: Reflect changes above.
+	* gxx01/init.c: Removed fatal error test case.
+
 2010-08-10	Bharath Suri <bharath.s.jois@gmail.com>
 
 	PR 1661/testing
diff --git a/testsuites/libtests/Makefile.am b/testsuites/libtests/Makefile.am
index 366c2f4f65..aaf8889ef8 100644
--- a/testsuites/libtests/Makefile.am
+++ b/testsuites/libtests/Makefile.am
@@ -7,7 +7,7 @@ ACLOCAL_AMFLAGS = -I ../aclocal
 SUBDIRS = POSIX
 
 SUBDIRS += bspcmdline01 cpuuse devfs01 devfs02 devfs03 devfs04 \
-    deviceio01 devnullfatal01 dumpbuf01 gxx01 gxx02 \
+    deviceio01 devnullfatal01 dumpbuf01 gxx01 \
     malloctest malloc02 malloc03 malloc04 malloc05 heapwalk \
     putenvtest monitor monitor02 rtmonuse stackchk stackchk01 \
     termios termios01 termios02 termios03 termios04 termios05 \
diff --git a/testsuites/libtests/configure.ac b/testsuites/libtests/configure.ac
index 030754ed3f..a18b152c57 100644
--- a/testsuites/libtests/configure.ac
+++ b/testsuites/libtests/configure.ac
@@ -57,7 +57,6 @@ deviceio01/Makefile
 devnullfatal01/Makefile
 dumpbuf01/Makefile
 gxx01/Makefile
-gxx02/Makefile
 heapwalk/Makefile
 malloctest/Makefile
 malloc02/Makefile
diff --git a/testsuites/libtests/gxx01/gxx_wrappers.h b/testsuites/libtests/gxx01/gxx_wrappers.h
deleted file mode 100755
index 7db7715c41..0000000000
--- a/testsuites/libtests/gxx01/gxx_wrappers.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * RTEMS threads compatibily routines for libgcc2.
- *
- * $Id$
- */
-
-#ifndef __GCC_WRAPPERS_h 
-#define __GCC_WRAPPERS_h
-
-/*
- * These typedefs should match with the ones defined in the file
- * gcc/gthr-rtems.h in the gcc distribution.
- * FIXME: T.S, 2007/01/31: -> gcc/gthr-rtems.h still declares
- *                            void * __gthread_key_t;
- */
-typedef struct __gthread_key_ {
-	void *val; 	           /* this is switched with the task      */
-	void (*dtor)(void*);   /* this remains in place for all tasks */
-} __gthread_key, *__gthread_key_t;
-
-typedef int   __gthread_once_t;
-typedef void *__gthread_mutex_t;
-typedef void *__gthread_recursive_mutex_t;
-
-int rtems_gxx_once(__gthread_once_t *once, void (*func) (void));
-
-int rtems_gxx_key_create (__gthread_key_t *key, void (*dtor) (void *));
-
-int rtems_gxx_key_dtor (__gthread_key_t key, void *ptr);
-
-int rtems_gxx_key_delete (__gthread_key_t key);
-
-void *rtems_gxx_getspecific(__gthread_key_t key);
-
-int rtems_gxx_setspecific(__gthread_key_t key, const void *ptr);
-
-/*
- * MUTEX support
- */
-void rtems_gxx_mutex_init (__gthread_mutex_t *mutex);
-
-int rtems_gxx_mutex_lock (__gthread_mutex_t *mutex);
-
-int rtems_gxx_mutex_destroy (__gthread_mutex_t *mutex);
-
-int rtems_gxx_mutex_trylock (__gthread_mutex_t *mutex);
-
-int rtems_gxx_mutex_unlock (__gthread_mutex_t *mutex);
-
-void rtems_gxx_recursive_mutex_init(__gthread_recursive_mutex_t *mutex);
-
-int rtems_gxx_recursive_mutex_lock(__gthread_recursive_mutex_t *mutex);
-
-int rtems_gxx_recursive_mutex_trylock(__gthread_recursive_mutex_t *mutex);
-
-int rtems_gxx_recursive_mutex_unlock(__gthread_recursive_mutex_t *mutex);
-
-#endif
diff --git a/testsuites/libtests/gxx01/init.c b/testsuites/libtests/gxx01/init.c
index 3ab36b2338..fd8245bb4c 100644
--- a/testsuites/libtests/gxx01/init.c
+++ b/testsuites/libtests/gxx01/init.c
@@ -11,7 +11,7 @@
 
 #include <tmacros.h>
 #include "test_support.h"
-#include "gxx_wrappers.h"
+#include <rtems/gxx_wrappers.h>
 
 void test_recursive_mutex(void)
 {
@@ -164,20 +164,6 @@ void test_key(void)
   rtems_test_assert( key == NULL );
 }
 
-void test_out_of_mutexes(void)
-{
-   __gthread_mutex_t mutex;
-
-  puts( "rtems_gxx_mutex_init() until exhausted and panic" );
-  puts( "rtems_gxx_mutex_init() panic AFTER printing EOF message" );
-  puts( "*** END OF TEST GXX 01 ***" );
-
-  while (1) {
-    rtems_gxx_mutex_init(&mutex);
-    rtems_test_assert( mutex != 0 );
-  }
-}
-
 rtems_task Init(
   rtems_task_argument argument
 )
@@ -196,9 +182,9 @@ rtems_task Init(
   test_key();
   puts( "" );
 
-  test_out_of_mutexes();
+  puts( "*** END OF TEST GXX 01 ***" );
 
-  /* does not return */
+  rtems_test_exit( 0 );
 }
 
 /* configuration information */
diff --git a/testsuites/libtests/gxx02/.cvsignore b/testsuites/libtests/gxx02/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/testsuites/libtests/gxx02/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/testsuites/libtests/gxx02/Makefile.am b/testsuites/libtests/gxx02/Makefile.am
deleted file mode 100644
index c5716deedc..0000000000
--- a/testsuites/libtests/gxx02/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-##
-## $Id$
-##
-
-MANAGERS = all
-
-rtems_tests_PROGRAMS = gxx02
-gxx02_SOURCES = init.c
-
-dist_rtems_tests_DATA = gxx02.scn
-dist_rtems_tests_DATA += gxx02.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
-AM_CPPFLAGS += -I$(top_srcdir)/gxx01
-
-LINK_OBJS = $(gxx02_OBJECTS) $(gxx02_LDADD)
-LINK_LIBS = $(gxx02_LDLIBS)
-
-gxx02$(EXEEXT): $(gxx02_OBJECTS) $(gxx02_DEPENDENCIES)
-	@rm -f gxx02$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/gxx02/gxx02.doc b/testsuites/libtests/gxx02/gxx02.doc
deleted file mode 100644
index bbedaa1cfc..0000000000
--- a/testsuites/libtests/gxx02/gxx02.doc
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-#  $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:  gxx01
-
-directives:
-
-  rtems_gxx_getspecific
-
-concepts:
-
-+ Exercise an error path in the rtems_gxx_getspecific() routine,
-leading to a rtems_panic
diff --git a/testsuites/libtests/gxx02/gxx02.scn b/testsuites/libtests/gxx02/gxx02.scn
deleted file mode 100644
index 0ed0b038d5..0000000000
--- a/testsuites/libtests/gxx02/gxx02.scn
+++ /dev/null
@@ -1,6 +0,0 @@
-*** TEST GXX 02 ***
-Init - allocating most of workspace memory
-rtems_gxx_getspecific() - panic and exit
-*** END OF TEST GXX 02 ***
-rtems_gxx_getspecific
-fatal error, exiting
diff --git a/testsuites/libtests/gxx02/init.c b/testsuites/libtests/gxx02/init.c
deleted file mode 100644
index babf4e6b77..0000000000
--- a/testsuites/libtests/gxx02/init.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *  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 "gxx_wrappers.h"
-#include <rtems/score/heap.h>
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-
-  void                   *alloc_ptr = (void *)0;
-  Heap_Information_block  Info;
-  __gthread_key_t         key = 0;
-  int                     status = 0;
-  void                   *retptr;
-
-  puts( "\n\n*** TEST GXX 02 ***" );
-
-  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( "rtems_gxx_getspecific() - panic and exit" );
-
-  puts( "*** END OF TEST GXX 02 ***" );
-
-  /* The below call will not return and hence the END OF above */
-  retptr = rtems_gxx_getspecific( key );
-}
-
-/* configuration information */
-
-#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS        1
-#define CONFIGURE_MAXIMUM_SEMAPHORES   2
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#define CONFIGURE_INIT
-
-#include <rtems/confdefs.h>
-/* end of file */