10 files changed, 8 insertions, 18 deletions
diff --git a/testsuites/sptests/spfatal14/Makefile.am b/testsuites/sptests/spfatal14/Makefile.am
index c070b3c4dd..e5d1ee1754 100644
--- a/testsuites/sptests/spfatal14/Makefile.am
+++ b/testsuites/sptests/spfatal14/Makefile.am
@@ -11,7 +11,6 @@ include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -DSEMAPHORES_REMAINING=5
 
 LINK_OBJS = $(spfatal14_OBJECTS)
 LINK_LIBS = $(spfatal14_LDLIBS)
diff --git a/testsuites/sptests/spfatal14/testcase.h b/testsuites/sptests/spfatal14/testcase.h
index e9e95b62e0..a63541b9e4 100644
--- a/testsuites/sptests/spfatal14/testcase.h
+++ b/testsuites/sptests/spfatal14/testcase.h
@@ -17,8 +17,7 @@
 #define FATAL_ERROR_EXPECTED_IS_INTERNAL FALSE
 #define FATAL_ERROR_EXPECTED_ERROR       0x55544431
 
-#define CONFIGURE_APPLICATION_PREREQUISITE_DRIVERS \
-  CONSUME_SEMAPHORE_DRIVERS
+#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 1
 
 void force_error()
 {
diff --git a/testsuites/sptests/spfatal15/Makefile.am b/testsuites/sptests/spfatal15/Makefile.am
index ffeb24a418..485c92af6b 100644
--- a/testsuites/sptests/spfatal15/Makefile.am
+++ b/testsuites/sptests/spfatal15/Makefile.am
@@ -11,7 +11,6 @@ include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -DSEMAPHORES_REMAINING=6
 
 LINK_OBJS = $(spfatal15_OBJECTS)
 LINK_LIBS = $(spfatal15_LDLIBS)
diff --git a/testsuites/sptests/spfatal15/testcase.h b/testsuites/sptests/spfatal15/testcase.h
index 66ca243917..7570e4e5c8 100644
--- a/testsuites/sptests/spfatal15/testcase.h
+++ b/testsuites/sptests/spfatal15/testcase.h
@@ -16,8 +16,7 @@
 #define FATAL_ERROR_EXPECTED_IS_INTERNAL FALSE
 #define FATAL_ERROR_EXPECTED_ERROR       0x55544432
 
-#define CONFIGURE_APPLICATION_PREREQUISITE_DRIVERS \
-  { consume_semaphores_initialize, NULL, NULL, NULL, NULL, NULL }
+#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 2
 
 void force_error()
 {
diff --git a/testsuites/sptests/spfatal16/testcase.h b/testsuites/sptests/spfatal16/testcase.h
index 6a228381a6..fed0d4a7ff 100644
--- a/testsuites/sptests/spfatal16/testcase.h
+++ b/testsuites/sptests/spfatal16/testcase.h
@@ -24,5 +24,7 @@
 
 void force_error()
 {
-  /* we will not run this far */
+  /* This fatal error depends on the Termios device configuration */
+  printk( "*** END OF TEST FATAL " FATAL_ERROR_TEST_NAME " ***\n" );
+  rtems_test_exit(0);
 }
diff --git a/testsuites/sptests/spfatal17/Makefile.am b/testsuites/sptests/spfatal17/Makefile.am
index 8e2557279c..745ca43f3e 100644
--- a/testsuites/sptests/spfatal17/Makefile.am
+++ b/testsuites/sptests/spfatal17/Makefile.am
@@ -11,7 +11,7 @@ include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -DSEMAPHORES_REMAINING=4
+AM_CPPFLAGS += -DSEMAPHORES_REMAINING=3
 
 LINK_OBJS = $(spfatal17_OBJECTS)
 LINK_LIBS = $(spfatal17_LDLIBS)
diff --git a/testsuites/sptests/spfatal18/Makefile.am b/testsuites/sptests/spfatal18/Makefile.am
index a43608c5ca..31597bbf51 100644
--- a/testsuites/sptests/spfatal18/Makefile.am
+++ b/testsuites/sptests/spfatal18/Makefile.am
@@ -11,7 +11,7 @@ include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -DSEMAPHORES_REMAINING=3
+AM_CPPFLAGS += -DSEMAPHORES_REMAINING=2
 
 LINK_OBJS = $(spfatal18_OBJECTS)
 LINK_LIBS = $(spfatal18_LDLIBS)
diff --git a/testsuites/sptests/spfatal19/Makefile.am b/testsuites/sptests/spfatal19/Makefile.am
index 8f4105c0e7..8471aae478 100644
--- a/testsuites/sptests/spfatal19/Makefile.am
+++ b/testsuites/sptests/spfatal19/Makefile.am
@@ -11,7 +11,7 @@ include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -DSEMAPHORES_REMAINING=2
+AM_CPPFLAGS += -DSEMAPHORES_REMAINING=1
 
 LINK_OBJS = $(spfatal19_OBJECTS)
 LINK_LIBS = $(spfatal19_LDLIBS)
diff --git a/testsuites/sptests/spfatal20/testcase.h b/testsuites/sptests/spfatal20/testcase.h
index 566c4bfc36..08721a0f8d 100644
--- a/testsuites/sptests/spfatal20/testcase.h
+++ b/testsuites/sptests/spfatal20/testcase.h
@@ -9,10 +9,6 @@
  *  $Id$
  */
 
-/* generate fatal errors in termios.c 
- *    rtems_semaphore_create( rtems_build_name ('T', 'R', 'r', c),...);
- */
-
 #define FATAL_ERROR_TEST_NAME            "20"
 #define FATAL_ERROR_DESCRIPTION  \
   "rtems_termios_initialize cannot create semaphore"
diff --git a/testsuites/sptests/spfifo02/init.c b/testsuites/sptests/spfifo02/init.c
index 8526d0cde6..2725a5024a 100644
--- a/testsuites/sptests/spfifo02/init.c
+++ b/testsuites/sptests/spfifo02/init.c
@@ -145,11 +145,7 @@ rtems_task Init(
 
   puts( "Creating FIFO" );
   create_fifo();
-  
-  puts( "Opening FIFO.. expect ENFILE (semaphore @ open could not be created)" );
-  open_fifo(ENFILE, O_RDWR);
 
-  delete_semaphore();
   puts( "Opening FIFO.. expect ENOMEM (semaphore for pipe could not be created)" );
   open_fifo(ENOMEM, O_RDWR);