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

	* sp51/init.c, sp54/Makefile.am, sp55/Makefile.am, sp56/Makefile.am,
	sp57/Makefile.am, spchain/Makefile.am, spfatal10/Makefile.am,
	spfatal11/Makefile.am, spfatal12/Makefile.am: Remove unneeded
	USE_TIMER_SERVER which was copied fomr other Makefile.am's.

10 files changed, 8 insertions, 10 deletions

diff --git a/testsuites/sptests/ChangeLog b/testsuites/sptests/ChangeLog
index dd1ed4199d..071edf6dea 100644
--- a/testsuites/sptests/ChangeLog
+++ b/testsuites/sptests/ChangeLog
@@ -1,5 +1,12 @@
 2009-07-08	Joel Sherrill <joel.sherrill@OARcorp.com>
 
+	* sp51/init.c, sp54/Makefile.am, sp55/Makefile.am, sp56/Makefile.am,
+	sp57/Makefile.am, spchain/Makefile.am, spfatal10/Makefile.am,
+	spfatal11/Makefile.am, spfatal12/Makefile.am: Remove unneeded
+	USE_TIMER_SERVER which was copied fomr other Makefile.am's.
+
+2009-07-08	Joel Sherrill <joel.sherrill@OARcorp.com>
+
 	* sp57/sp57.doc: Correct.
 
 2009-07-08	Joel Sherrill <joel.sherrill@OARcorp.com>
diff --git a/testsuites/sptests/sp51/init.c b/testsuites/sptests/sp51/init.c
index 7a09dea1f6..8f34cab5c7 100644
--- a/testsuites/sptests/sp51/init.c
+++ b/testsuites/sptests/sp51/init.c
@@ -48,8 +48,7 @@ rtems_task Init(
   /* This returns successful because RTEMS eats the unneeded unlock */
   puts( "Release semaphore we did not obtain" );
   sc = rtems_semaphore_release( mutex );
-  fatal_directive_status(
-    sc, RTEMS_SUCCESSFUL, "rtems_semaphore_release" );
+  directive_failed( sc, "rtems_semaphore_release" );
 
   puts( "*** END OF TEST 51 ***" );
   rtems_test_exit( 0 );
diff --git a/testsuites/sptests/sp54/Makefile.am b/testsuites/sptests/sp54/Makefile.am
index e83d881a04..a694b82dfe 100644
--- a/testsuites/sptests/sp54/Makefile.am
+++ b/testsuites/sptests/sp54/Makefile.am
@@ -17,7 +17,6 @@ include $(top_srcdir)/../automake/leaf.am
 sp54_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -DUSE_TIMER_SERVER
 
 LINK_OBJS = $(sp54_OBJECTS) $(sp54_LDADD)
 LINK_LIBS = $(sp54_LDLIBS)
diff --git a/testsuites/sptests/sp55/Makefile.am b/testsuites/sptests/sp55/Makefile.am
index 16958d1920..9edf1a9ae0 100644
--- a/testsuites/sptests/sp55/Makefile.am
+++ b/testsuites/sptests/sp55/Makefile.am
@@ -17,7 +17,6 @@ include $(top_srcdir)/../automake/leaf.am
 sp55_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -DUSE_TIMER_SERVER
 
 LINK_OBJS = $(sp55_OBJECTS) $(sp55_LDADD)
 LINK_LIBS = $(sp55_LDLIBS)
diff --git a/testsuites/sptests/sp56/Makefile.am b/testsuites/sptests/sp56/Makefile.am
index 93bc30be23..b591e78f82 100644
--- a/testsuites/sptests/sp56/Makefile.am
+++ b/testsuites/sptests/sp56/Makefile.am
@@ -17,7 +17,6 @@ include $(top_srcdir)/../automake/leaf.am
 sp56_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -DUSE_TIMER_SERVER
 
 LINK_OBJS = $(sp56_OBJECTS) $(sp56_LDADD)
 LINK_LIBS = $(sp56_LDLIBS)
diff --git a/testsuites/sptests/sp57/Makefile.am b/testsuites/sptests/sp57/Makefile.am
index e15340c96c..e497d5151f 100644
--- a/testsuites/sptests/sp57/Makefile.am
+++ b/testsuites/sptests/sp57/Makefile.am
@@ -17,7 +17,6 @@ include $(top_srcdir)/../automake/leaf.am
 sp57_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -DUSE_TIMER_SERVER
 
 LINK_OBJS = $(sp57_OBJECTS) $(sp57_LDADD)
 LINK_LIBS = $(sp57_LDLIBS)
diff --git a/testsuites/sptests/spchain/Makefile.am b/testsuites/sptests/spchain/Makefile.am
index 980744a1f7..92cf1b4042 100644
--- a/testsuites/sptests/spchain/Makefile.am
+++ b/testsuites/sptests/spchain/Makefile.am
@@ -17,7 +17,6 @@ include $(top_srcdir)/../automake/leaf.am
 spchain_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -DUSE_TIMER_SERVER
 
 LINK_OBJS = $(spchain_OBJECTS) $(spchain_LDADD)
 LINK_LIBS = $(spchain_LDLIBS)
diff --git a/testsuites/sptests/spfatal10/Makefile.am b/testsuites/sptests/spfatal10/Makefile.am
index 90ffb5f74c..04cb312649 100644
--- a/testsuites/sptests/spfatal10/Makefile.am
+++ b/testsuites/sptests/spfatal10/Makefile.am
@@ -17,7 +17,6 @@ include $(top_srcdir)/../automake/leaf.am
 spfatal10_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -DUSE_TIMER_SERVER
 
 LINK_OBJS = $(spfatal10_OBJECTS) $(spfatal10_LDADD)
 LINK_LIBS = $(spfatal10_LDLIBS)
diff --git a/testsuites/sptests/spfatal11/Makefile.am b/testsuites/sptests/spfatal11/Makefile.am
index 0f83be669e..22e012f2bd 100644
--- a/testsuites/sptests/spfatal11/Makefile.am
+++ b/testsuites/sptests/spfatal11/Makefile.am
@@ -17,7 +17,6 @@ include $(top_srcdir)/../automake/leaf.am
 spfatal11_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -DUSE_TIMER_SERVER
 
 LINK_OBJS = $(spfatal11_OBJECTS) $(spfatal11_LDADD)
 LINK_LIBS = $(spfatal11_LDLIBS)
diff --git a/testsuites/sptests/spfatal12/Makefile.am b/testsuites/sptests/spfatal12/Makefile.am
index 6075e02c5b..7742b0e17d 100644
--- a/testsuites/sptests/spfatal12/Makefile.am
+++ b/testsuites/sptests/spfatal12/Makefile.am
@@ -17,7 +17,6 @@ include $(top_srcdir)/../automake/leaf.am
 spfatal12_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -DUSE_TIMER_SERVER
 
 LINK_OBJS = $(spfatal12_OBJECTS) $(spfatal12_LDADD)
 LINK_LIBS = $(spfatal12_LDLIBS)