2010-06-23 Joel Sherrill <joel.sherrilL@OARcorp.com>

	* Makefile.am, configure.ac, psx01/Makefile.am, psx02/Makefile.am,
	psx03/Makefile.am, psx04/Makefile.am, psx05/Makefile.am,
	psx06/Makefile.am, psx07/Makefile.am, psx08/Makefile.am,
	psx09/Makefile.am, psx10/Makefile.am, psx11/Makefile.am,
	psx12/Makefile.am, psx13/Makefile.am, psx14/Makefile.am,
	psxalarm01/Makefile.am, psxautoinit01/Makefile.am,
	psxautoinit02/Makefile.am, psxbarrier01/Makefile.am,
	psxcancel/Makefile.am, psxcancel01/Makefile.am,
	psxchroot01/Makefile.am, psxcleanup/Makefile.am,
	psxcleanup01/Makefile.am, psxclock/Makefile.am,
	psxcond01/Makefile.am, psxenosys/Makefile.am, psxfatal01/Makefile.am,
	psxfatal02/Makefile.am, psxfile01/Makefile.am, psxfile02/init.c,
	psxfile02/psxfile02.doc, psxfile02/psxfile02.scn,
	psxintrcritical01/Makefile.am, psxitimer/Makefile.am,
	psxkey01/Makefile.am, psxkey02/Makefile.am, psxkey03/Makefile.am,
	psxmount/Makefile.am, psxmsgq01/Makefile.am, psxmsgq02/Makefile.am,
	psxmsgq03/Makefile.am, psxmsgq04/Makefile.am,
	psxmutexattr01/Makefile.am, psxobj01/Makefile.am,
	psxpasswd01/Makefile.am, psxrdwrv/Makefile.am,
	psxreaddir/Makefile.am, psxrwlock01/Makefile.am,
	psxsem01/Makefile.am, psxsignal01/Makefile.am,
	psxsignal02/Makefile.am, psxsignal03/Makefile.am,
	psxsignal04/Makefile.am, psxsignal05/Makefile.am,
	psxspin01/Makefile.am, psxspin02/Makefile.am, psxstack01/Makefile.am,
	psxstat/Makefile.am, psxsysconf/Makefile.am, psxtime/Makefile.am,
	psxtimer01/Makefile.am, psxtimer02/Makefile.am,
	psxualarm/Makefile.am, psxusleep/Makefile.am: Add test for fd greater
	than number of file descriptors configured.

67 files changed, 103 insertions, 112 deletions

diff --git a/testsuites/psxtests/ChangeLog b/testsuites/psxtests/ChangeLog
index 6f63473000..ac392ba383 100644
--- a/testsuites/psxtests/ChangeLog
+++ b/testsuites/psxtests/ChangeLog
@@ -1,3 +1,34 @@
+2010-06-23	Joel Sherrill <joel.sherrilL@OARcorp.com>
+
+	* Makefile.am, configure.ac, psx01/Makefile.am, psx02/Makefile.am,
+	psx03/Makefile.am, psx04/Makefile.am, psx05/Makefile.am,
+	psx06/Makefile.am, psx07/Makefile.am, psx08/Makefile.am,
+	psx09/Makefile.am, psx10/Makefile.am, psx11/Makefile.am,
+	psx12/Makefile.am, psx13/Makefile.am, psx14/Makefile.am,
+	psxalarm01/Makefile.am, psxautoinit01/Makefile.am,
+	psxautoinit02/Makefile.am, psxbarrier01/Makefile.am,
+	psxcancel/Makefile.am, psxcancel01/Makefile.am,
+	psxchroot01/Makefile.am, psxcleanup/Makefile.am,
+	psxcleanup01/Makefile.am, psxclock/Makefile.am,
+	psxcond01/Makefile.am, psxenosys/Makefile.am, psxfatal01/Makefile.am,
+	psxfatal02/Makefile.am, psxfile01/Makefile.am, psxfile02/init.c,
+	psxfile02/psxfile02.doc, psxfile02/psxfile02.scn,
+	psxintrcritical01/Makefile.am, psxitimer/Makefile.am,
+	psxkey01/Makefile.am, psxkey02/Makefile.am, psxkey03/Makefile.am,
+	psxmount/Makefile.am, psxmsgq01/Makefile.am, psxmsgq02/Makefile.am,
+	psxmsgq03/Makefile.am, psxmsgq04/Makefile.am,
+	psxmutexattr01/Makefile.am, psxobj01/Makefile.am,
+	psxpasswd01/Makefile.am, psxrdwrv/Makefile.am,
+	psxreaddir/Makefile.am, psxrwlock01/Makefile.am,
+	psxsem01/Makefile.am, psxsignal01/Makefile.am,
+	psxsignal02/Makefile.am, psxsignal03/Makefile.am,
+	psxsignal04/Makefile.am, psxsignal05/Makefile.am,
+	psxspin01/Makefile.am, psxspin02/Makefile.am, psxstack01/Makefile.am,
+	psxstat/Makefile.am, psxsysconf/Makefile.am, psxtime/Makefile.am,
+	psxtimer01/Makefile.am, psxtimer02/Makefile.am,
+	psxualarm/Makefile.am, psxusleep/Makefile.am: Add test for fd greater
+	than number of file descriptors configured.
+
 2010-06-23	Jennifer Averett <Jennifer.Averett@OARcorp.com>
 
 	* psxfile02/psxfile02.doc: Filled in documentation information.
diff --git a/testsuites/psxtests/Makefile.am b/testsuites/psxtests/Makefile.am
index 364090723b..57a07765b9 100644
--- a/testsuites/psxtests/Makefile.am
+++ b/testsuites/psxtests/Makefile.am
@@ -10,8 +10,8 @@ SUBDIRS += psxhdrs psx01 psx02 psx03 psx04 psx05 psx06 psx07 psx08 psx09 \
     psx10 psx11 psx12 psx13 psx14 psxalarm01 \
     psxautoinit01 psxautoinit02 psxbarrier01 \
     psxcancel psxcancel01 psxcleanup psxcleanup01 \
-    psxcond01 psxenosys psxkey01 psxkey02 \
-    psxkey03 psxitimer psxmsgq01 psxmsgq02 psxmsgq03 psxmsgq04 \
+    psxcond01 psxenosys psxkey01 psxkey02 psxkey03 psxload01 \
+    psxitimer psxmsgq01 psxmsgq02 psxmsgq03 psxmsgq04 \
     psxmutexattr01 psxobj01 psxrwlock01 psxsem01 psxsignal01 psxsignal02 \
     psxsignal03 psxsignal04 psxsignal05 psxspin01 psxspin02 psxsysconf \
     psxtime psxtimer01 psxtimer02 psxualarm psxusleep psxfatal01 psxfatal02 \
diff --git a/testsuites/psxtests/configure.ac b/testsuites/psxtests/configure.ac
index b628a9bc76..ef11723723 100644
--- a/testsuites/psxtests/configure.ac
+++ b/testsuites/psxtests/configure.ac
@@ -22,6 +22,8 @@ RTEMS_CANONICALIZE_TOOLS
 
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 
+RTEMS_OBJECT_FORMAT
+
 AM_CONDITIONAL([HAS_NETWORKING],[test "$HAS_NETWORKING" = "yes"])
 
 RTEMS_CHECK_CPUOPTS([RTEMS_POSIX_API])
@@ -94,6 +96,7 @@ psxitimer/Makefile
 psxkey01/Makefile
 psxkey02/Makefile
 psxkey03/Makefile
+psxload01/Makefile
 psxmount/Makefile
 psxmsgq01/Makefile
 psxmsgq02/Makefile
diff --git a/testsuites/psxtests/psx01/Makefile.am b/testsuites/psxtests/psx01/Makefile.am
index 40911591f3..647dd0824e 100644
--- a/testsuites/psxtests/psx01/Makefile.am
+++ b/testsuites/psxtests/psx01/Makefile.am
@@ -13,7 +13,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psx01_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psx02/Makefile.am b/testsuites/psxtests/psx02/Makefile.am
index d47b564eb6..7aee94cf79 100644
--- a/testsuites/psxtests/psx02/Makefile.am
+++ b/testsuites/psxtests/psx02/Makefile.am
@@ -13,7 +13,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psx02_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psx03/Makefile.am b/testsuites/psxtests/psx03/Makefile.am
index aed0b946a7..123d823931 100644
--- a/testsuites/psxtests/psx03/Makefile.am
+++ b/testsuites/psxtests/psx03/Makefile.am
@@ -13,7 +13,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psx03_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psx04/Makefile.am b/testsuites/psxtests/psx04/Makefile.am
index 1ae6abaebf..663b8a5870 100644
--- a/testsuites/psxtests/psx04/Makefile.am
+++ b/testsuites/psxtests/psx04/Makefile.am
@@ -13,7 +13,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psx04_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psx05/Makefile.am b/testsuites/psxtests/psx05/Makefile.am
index 206c4cd9fc..a84de30292 100644
--- a/testsuites/psxtests/psx05/Makefile.am
+++ b/testsuites/psxtests/psx05/Makefile.am
@@ -13,7 +13,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psx05_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psx06/Makefile.am b/testsuites/psxtests/psx06/Makefile.am
index a5850654e2..d5e6a19be6 100644
--- a/testsuites/psxtests/psx06/Makefile.am
+++ b/testsuites/psxtests/psx06/Makefile.am
@@ -13,7 +13,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psx06_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psx07/Makefile.am b/testsuites/psxtests/psx07/Makefile.am
index 9169743b90..064eacf0bc 100644
--- a/testsuites/psxtests/psx07/Makefile.am
+++ b/testsuites/psxtests/psx07/Makefile.am
@@ -13,7 +13,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psx07_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psx08/Makefile.am b/testsuites/psxtests/psx08/Makefile.am
index 4d28da8a6c..b250131cd9 100644
--- a/testsuites/psxtests/psx08/Makefile.am
+++ b/testsuites/psxtests/psx08/Makefile.am
@@ -13,7 +13,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psx08_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psx09/Makefile.am b/testsuites/psxtests/psx09/Makefile.am
index 1450ce3dee..16219d22ba 100644
--- a/testsuites/psxtests/psx09/Makefile.am
+++ b/testsuites/psxtests/psx09/Makefile.am
@@ -13,7 +13,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psx09_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psx10/Makefile.am b/testsuites/psxtests/psx10/Makefile.am
index e4b787a124..fd69a07e1f 100644
--- a/testsuites/psxtests/psx10/Makefile.am
+++ b/testsuites/psxtests/psx10/Makefile.am
@@ -13,7 +13,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psx10_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psx11/Makefile.am b/testsuites/psxtests/psx11/Makefile.am
index d5e5ff821e..447aa2ea78 100644
--- a/testsuites/psxtests/psx11/Makefile.am
+++ b/testsuites/psxtests/psx11/Makefile.am
@@ -13,7 +13,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psx11_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psx12/Makefile.am b/testsuites/psxtests/psx12/Makefile.am
index c52875f437..6139344662 100644
--- a/testsuites/psxtests/psx12/Makefile.am
+++ b/testsuites/psxtests/psx12/Makefile.am
@@ -13,7 +13,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psx12_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psx13/Makefile.am b/testsuites/psxtests/psx13/Makefile.am
index 898f8f2bf5..bff3326965 100644
--- a/testsuites/psxtests/psx13/Makefile.am
+++ b/testsuites/psxtests/psx13/Makefile.am
@@ -13,7 +13,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psx13_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psx14/Makefile.am b/testsuites/psxtests/psx14/Makefile.am
index ccbe9c3ffd..3b470a25e9 100644
--- a/testsuites/psxtests/psx14/Makefile.am
+++ b/testsuites/psxtests/psx14/Makefile.am
@@ -13,7 +13,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psx14_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psxalarm01/Makefile.am b/testsuites/psxtests/psxalarm01/Makefile.am
index ab9b5a4a85..4d10359b9d 100644
--- a/testsuites/psxtests/psxalarm01/Makefile.am
+++ b/testsuites/psxtests/psxalarm01/Makefile.am
@@ -14,7 +14,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxalarm01_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psxautoinit01/Makefile.am b/testsuites/psxtests/psxautoinit01/Makefile.am
index 169999c157..b491b40aa6 100644
--- a/testsuites/psxtests/psxautoinit01/Makefile.am
+++ b/testsuites/psxtests/psxautoinit01/Makefile.am
@@ -14,7 +14,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxautoinit01_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psxautoinit02/Makefile.am b/testsuites/psxtests/psxautoinit02/Makefile.am
index 935b5029e0..1495e0ce9c 100644
--- a/testsuites/psxtests/psxautoinit02/Makefile.am
+++ b/testsuites/psxtests/psxautoinit02/Makefile.am
@@ -16,7 +16,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxautoinit02_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psxbarrier01/Makefile.am b/testsuites/psxtests/psxbarrier01/Makefile.am
index 8101eaed53..4f67e8852d 100644
--- a/testsuites/psxtests/psxbarrier01/Makefile.am
+++ b/testsuites/psxtests/psxbarrier01/Makefile.am
@@ -14,7 +14,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxbarrier01_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psxcancel/Makefile.am b/testsuites/psxtests/psxcancel/Makefile.am
index caab977476..0efea14559 100644
--- a/testsuites/psxtests/psxcancel/Makefile.am
+++ b/testsuites/psxtests/psxcancel/Makefile.am
@@ -14,7 +14,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxcancel_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psxcancel01/Makefile.am b/testsuites/psxtests/psxcancel01/Makefile.am
index 60225ab7b5..4597805af9 100644
--- a/testsuites/psxtests/psxcancel01/Makefile.am
+++ b/testsuites/psxtests/psxcancel01/Makefile.am
@@ -14,7 +14,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxcancel01_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psxchroot01/Makefile.am b/testsuites/psxtests/psxchroot01/Makefile.am
index 2ec0c436a4..297b2b4e9a 100644
--- a/testsuites/psxtests/psxchroot01/Makefile.am
+++ b/testsuites/psxtests/psxchroot01/Makefile.am
@@ -13,7 +13,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxchroot01_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psxcleanup/Makefile.am b/testsuites/psxtests/psxcleanup/Makefile.am
index ec4d111c7c..2bcab4a17d 100644
--- a/testsuites/psxtests/psxcleanup/Makefile.am
+++ b/testsuites/psxtests/psxcleanup/Makefile.am
@@ -13,7 +13,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxcleanup_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psxcleanup01/Makefile.am b/testsuites/psxtests/psxcleanup01/Makefile.am
index b62793cc64..f1e6542f2e 100644
--- a/testsuites/psxtests/psxcleanup01/Makefile.am
+++ b/testsuites/psxtests/psxcleanup01/Makefile.am
@@ -13,7 +13,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxcleanup01_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psxclock/Makefile.am b/testsuites/psxtests/psxclock/Makefile.am
index e456cb76dc..dec6ee146c 100644
--- a/testsuites/psxtests/psxclock/Makefile.am
+++ b/testsuites/psxtests/psxclock/Makefile.am
@@ -14,7 +14,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxclock_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psxcond01/Makefile.am b/testsuites/psxtests/psxcond01/Makefile.am
index 605e67fa73..6c2bd924dc 100644
--- a/testsuites/psxtests/psxcond01/Makefile.am
+++ b/testsuites/psxtests/psxcond01/Makefile.am
@@ -14,7 +14,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxcond01_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psxenosys/Makefile.am b/testsuites/psxtests/psxenosys/Makefile.am
index b61ec4410c..c0e001b957 100644
--- a/testsuites/psxtests/psxenosys/Makefile.am
+++ b/testsuites/psxtests/psxenosys/Makefile.am
@@ -14,7 +14,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxenosys_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psxfatal01/Makefile.am b/testsuites/psxtests/psxfatal01/Makefile.am
index d6adbda05f..0292616415 100644
--- a/testsuites/psxtests/psxfatal01/Makefile.am
+++ b/testsuites/psxtests/psxfatal01/Makefile.am
@@ -13,7 +13,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxfatal01_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
diff --git a/testsuites/psxtests/psxfatal02/Makefile.am b/testsuites/psxtests/psxfatal02/Makefile.am
index 28fe2389d5..cc0cf932a5 100644
--- a/testsuites/psxtests/psxfatal02/Makefile.am
+++ b/testsuites/psxtests/psxfatal02/Makefile.am
@@ -13,7 +13,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxfatal02_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
diff --git a/testsuites/psxtests/psxfile01/Makefile.am b/testsuites/psxtests/psxfile01/Makefile.am
index 519d7b81b1..06522dd262 100644
--- a/testsuites/psxtests/psxfile01/Makefile.am
+++ b/testsuites/psxtests/psxfile01/Makefile.am
@@ -13,7 +13,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxfile01_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psxfile02/init.c b/testsuites/psxtests/psxfile02/init.c
index 778e033b04..6aa8a5ce35 100644
--- a/testsuites/psxtests/psxfile02/init.c
+++ b/testsuites/psxtests/psxfile02/init.c
@@ -18,6 +18,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <rtems/imfs.h>
+#include <reent.h>
 
 #include <rtems.h>
 #include <rtems/libio.h>
@@ -25,112 +26,105 @@
 #include <tmacros.h>
 #include "test_support.h"
 
-int _fcntl_r(
-  struct _reent *ptr __attribute__((unused)),
-  int fd,
-  int cmd,
-  int arg
-);
-
-off_t _lseek_r(
-  struct _reent *ptr __attribute__((unused)),
-  int            fd,
-  off_t          offset,
-  int            whence
-);
-
-
-
-rtems_task Init(
-  rtems_task_argument argument
+void do_with_fd(
+  int         fd,
+  const char *description
 )
 {
-  int               fd;
   struct stat       stat_buff;
   struct iovec      vec[4];
   off_t             res;
   int               status;
 
-  puts( "\n\n*** PSXFILE02 TEST  ***" );
-
-  /*
-   *  Simple open case where the file is created.
-   */
-  puts( "mkdir /tmp" );
-  status = mkdir( "/tmp", S_IRWXU );
-  rtems_test_assert( !status );
-
-  puts( "open /tmp/j" );
-  fd = open( "/tmp/j", O_RDWR|O_CREAT, S_IRWXU|S_IRWXG|S_IRWXO );
-  rtems_test_assert( fd != -1 );
-  printf( "open returned file descriptor %d\n", fd );
-
-  puts( "close /tmp/j" );
-  status = close( fd );
-  rtems_test_assert( !status );
-
-  puts("ftruncate an unopened file");
+  printf("ftruncate %s\n", description);
   status = ftruncate(fd, 40);
   rtems_test_assert( status == -1 );
   printf( "%d: %s\n", errno, strerror( errno ) );
   rtems_test_assert( errno == EBADF );
 
-  puts("_fcntl_r unopened file");
+  printf("_fcntl_r %s\n", description);
   status = _fcntl_r( NULL, fd, F_SETFD, 1 );
   rtems_test_assert( status == -1 );
   printf( "%d: %s\n", errno, strerror( errno ) );
   rtems_test_assert( errno == EBADF );
 
-  puts("fdatasync unopened file");
+  printf("fdatasync %s\n", description);
   status = fdatasync( fd );
   rtems_test_assert( status == -1 );
   printf( "%d: %s\n", errno, strerror( errno ) );
   rtems_test_assert( errno == EBADF );
 
-  puts("fstat unopened file");
+  printf("fstat %s\n", description);
   status = fstat( fd, &stat_buff );
   rtems_test_assert( status == -1 );
   printf( "%d: %s\n", errno, strerror( errno ) );
   rtems_test_assert( errno == EBADF );
 
-  puts("fsync unopened file");
+  printf("fsync %s\n", description);
   status = fsync( fd );
   rtems_test_assert( status == -1 );
   printf( "%d: %s\n", errno, strerror( errno ) );
   rtems_test_assert( errno == EBADF );
 
-  puts("ioctl unopened file");
+  printf("ioctl %s\n", description);
   status = ioctl( fd, 0 );
   rtems_test_assert( status == -1 );
   printf( "%d: %s\n", errno, strerror( errno ) );
   rtems_test_assert( errno == EBADF );
 
-  puts("_lseek_r unopened file");
+  printf("_lseek_r %s\n", description);
   res = _lseek_r (NULL, fd, 0, SEEK_SET);
   rtems_test_assert( res == -1 );
   printf( "%d: %s\n", errno, strerror( errno ) );
   rtems_test_assert( errno == EBADF );
 
-  puts("readv unopened file");
+  printf("readv %s\n", description);
   status = readv(fd, vec, 4);
   rtems_test_assert( status == -1 );
   printf( "%d: %s\n", errno, strerror( errno ) );
   rtems_test_assert( errno == EBADF );
 
-  puts("writev unopened file");
+  printf("writev %s\n", description);
   status = writev(fd, vec, 4);
   rtems_test_assert( status == -1 );
   printf( "%d: %s\n", errno, strerror( errno ) );
   rtems_test_assert( errno == EBADF );
 
-  puts("write unopened file");
+  printf("write %s\n", description);
   status = write(fd, "1234", 4);
   rtems_test_assert( status == -1 );
   printf( "%d: %s\n", errno, strerror( errno ) );
   rtems_test_assert( errno == EBADF );
+}
+
+rtems_task Init(
+  rtems_task_argument argument
+)
+{
+  int   status;
+  int   fd;
 
+  puts( "\n\n*** PSXFILE02 TEST  ***" );
 
+  /*
+   *  Simple open case where the file is created.
+   */
+  puts( "mkdir /tmp" );
+  status = mkdir( "/tmp", S_IRWXU );
+  rtems_test_assert( !status );
+
+  puts( "open /tmp/j" );
+  fd = open( "/tmp/j", O_RDWR|O_CREAT, S_IRWXU|S_IRWXG|S_IRWXO );
+  rtems_test_assert( fd != -1 );
+  printf( "open returned file descriptor %d\n", fd );
+
+  puts( "close /tmp/j" );
+  status = close( fd );
+  rtems_test_assert( !status );
 
+  do_with_fd( fd, "an unopened file" );
+  puts("");
+  do_with_fd( 1000, "a too large file descriptor" );
 
   puts( "*** END OF PSXFILE02 TEST  ***" );
 
@@ -142,7 +136,7 @@ rtems_task Init(
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 #define CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM
-#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 6
+#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
 #define CONFIGURE_MAXIMUM_TASKS 1
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
diff --git a/testsuites/psxtests/psxfile02/psxfile02.doc b/testsuites/psxtests/psxfile02/psxfile02.doc
index 02c45f1512..2f46886f94 100644
--- a/testsuites/psxtests/psxfile02/psxfile02.doc
+++ b/testsuites/psxtests/psxfile02/psxfile02.doc
@@ -31,5 +31,8 @@ directives:
 
 concepts:
 
-+ Verify failure when a previously opened, but now closed file descriptor is passed in.
++ Verify failure when a previously opened, but now closed file
+descriptor is used.
++ Verify failure when an out of range file descriptor (above the
+number configured) is used.
 
diff --git a/testsuites/psxtests/psxfile02/psxfile02.scn b/testsuites/psxtests/psxfile02/psxfile02.scn
index b581c52b52..da6b4952ed 100644
--- a/testsuites/psxtests/psxfile02/psxfile02.scn
+++ b/testsuites/psxtests/psxfile02/psxfile02.scn
@@ -23,4 +23,25 @@ writev unopened file
 9: Bad file number
 write unopened file
 9: Bad file number
+
+ftruncate a too large file descriptor
+9: Bad file number
+_fcntl_r a too large file descriptor
+9: Bad file number
+fdatasync a too large file descriptor
+9: Bad file number
+fstat a too large file descriptor
+9: Bad file number
+fsync a too large file descriptor
+9: Bad file number
+ioctl a too large file descriptor
+9: Bad file number
+_lseek_r a too large file descriptor
+9: Bad file number
+readv a too large file descriptor
+9: Bad file number
+writev a too large file descriptor
+9: Bad file number
+write a too large file descriptor
+9: Bad file number
 *** END OF PSXFILE02 TEST  ***
diff --git a/testsuites/psxtests/psxintrcritical01/Makefile.am b/testsuites/psxtests/psxintrcritical01/Makefile.am
index 86d8d0d7f1..aae6c0b360 100644
--- a/testsuites/psxtests/psxintrcritical01/Makefile.am
+++ b/testsuites/psxtests/psxintrcritical01/Makefile.am
@@ -15,7 +15,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxintrcritical01_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 AM_CPPFLAGS += -I$(top_srcdir)/../sptests/spintrcritical_support
diff --git a/testsuites/psxtests/psxitimer/Makefile.am b/testsuites/psxtests/psxitimer/Makefile.am
index 0fc74d7738..38d4cbfab4 100644
--- a/testsuites/psxtests/psxitimer/Makefile.am
+++ b/testsuites/psxtests/psxitimer/Makefile.am
@@ -13,7 +13,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxitimer_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psxkey01/Makefile.am b/testsuites/psxtests/psxkey01/Makefile.am
index 6755b25d6c..d14c036d78 100644
--- a/testsuites/psxtests/psxkey01/Makefile.am
+++ b/testsuites/psxtests/psxkey01/Makefile.am
@@ -15,7 +15,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxkey01_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psxkey02/Makefile.am b/testsuites/psxtests/psxkey02/Makefile.am
index e5dc34b7e4..68a91c7c05 100644
--- a/testsuites/psxtests/psxkey02/Makefile.am
+++ b/testsuites/psxtests/psxkey02/Makefile.am
@@ -14,7 +14,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxkey02_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psxkey03/Makefile.am b/testsuites/psxtests/psxkey03/Makefile.am
index 6394317e17..6b8ac2a353 100644
--- a/testsuites/psxtests/psxkey03/Makefile.am
+++ b/testsuites/psxtests/psxkey03/Makefile.am
@@ -14,7 +14,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxkey03_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psxmount/Makefile.am b/testsuites/psxtests/psxmount/Makefile.am
index 205297f5c9..1e911cbdd2 100644
--- a/testsuites/psxtests/psxmount/Makefile.am
+++ b/testsuites/psxtests/psxmount/Makefile.am
@@ -13,7 +13,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxmount_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psxmsgq01/Makefile.am b/testsuites/psxtests/psxmsgq01/Makefile.am
index 41ca0afb16..652c5cb129 100644
--- a/testsuites/psxtests/psxmsgq01/Makefile.am
+++ b/testsuites/psxtests/psxmsgq01/Makefile.am
@@ -15,7 +15,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxmsgq01_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psxmsgq02/Makefile.am b/testsuites/psxtests/psxmsgq02/Makefile.am
index 7d50113cfb..56303a499b 100644
--- a/testsuites/psxtests/psxmsgq02/Makefile.am
+++ b/testsuites/psxtests/psxmsgq02/Makefile.am
@@ -14,7 +14,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxmsgq02_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psxmsgq03/Makefile.am b/testsuites/psxtests/psxmsgq03/Makefile.am
index 15f6ae3273..a786790f17 100644
--- a/testsuites/psxtests/psxmsgq03/Makefile.am
+++ b/testsuites/psxtests/psxmsgq03/Makefile.am
@@ -15,7 +15,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxmsgq03_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psxmsgq04/Makefile.am b/testsuites/psxtests/psxmsgq04/Makefile.am
index ada73d494b..1ff32ed263 100644
--- a/testsuites/psxtests/psxmsgq04/Makefile.am
+++ b/testsuites/psxtests/psxmsgq04/Makefile.am
@@ -15,7 +15,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxmsgq04_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psxmutexattr01/Makefile.am b/testsuites/psxtests/psxmutexattr01/Makefile.am
index 9f8becae61..f370e71e45 100644
--- a/testsuites/psxtests/psxmutexattr01/Makefile.am
+++ b/testsuites/psxtests/psxmutexattr01/Makefile.am
@@ -14,7 +14,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxmutexattr01_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psxobj01/Makefile.am b/testsuites/psxtests/psxobj01/Makefile.am
index d6f8c741c3..cb4edcb64e 100644
--- a/testsuites/psxtests/psxobj01/Makefile.am
+++ b/testsuites/psxtests/psxobj01/Makefile.am
@@ -14,7 +14,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxobj01_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psxpasswd01/Makefile.am b/testsuites/psxtests/psxpasswd01/Makefile.am
index ab990a2117..198d833a35 100644
--- a/testsuites/psxtests/psxpasswd01/Makefile.am
+++ b/testsuites/psxtests/psxpasswd01/Makefile.am
@@ -13,7 +13,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxpasswd01_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psxrdwrv/Makefile.am b/testsuites/psxtests/psxrdwrv/Makefile.am
index 6fc46278bd..c26d3c0a5f 100644
--- a/testsuites/psxtests/psxrdwrv/Makefile.am
+++ b/testsuites/psxtests/psxrdwrv/Makefile.am
@@ -13,7 +13,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxrdwrv_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psxreaddir/Makefile.am b/testsuites/psxtests/psxreaddir/Makefile.am
index 87a1184d0a..2763a834bf 100644
--- a/testsuites/psxtests/psxreaddir/Makefile.am
+++ b/testsuites/psxtests/psxreaddir/Makefile.am
@@ -13,7 +13,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxreaddir_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psxrwlock01/Makefile.am b/testsuites/psxtests/psxrwlock01/Makefile.am
index 186a8f5d29..de1d7a7c42 100644
--- a/testsuites/psxtests/psxrwlock01/Makefile.am
+++ b/testsuites/psxtests/psxrwlock01/Makefile.am
@@ -14,7 +14,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxrwlock01_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psxsem01/Makefile.am b/testsuites/psxtests/psxsem01/Makefile.am
index 6b4291167f..02c6e35c44 100644
--- a/testsuites/psxtests/psxsem01/Makefile.am
+++ b/testsuites/psxtests/psxsem01/Makefile.am
@@ -14,7 +14,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxsem01_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psxsignal01/Makefile.am b/testsuites/psxtests/psxsignal01/Makefile.am
index f0bd180cc2..ac77e96871 100644
--- a/testsuites/psxtests/psxsignal01/Makefile.am
+++ b/testsuites/psxtests/psxsignal01/Makefile.am
@@ -13,7 +13,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxsignal01_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psxsignal02/Makefile.am b/testsuites/psxtests/psxsignal02/Makefile.am
index ab16c24b49..05bd9eae78 100644
--- a/testsuites/psxtests/psxsignal02/Makefile.am
+++ b/testsuites/psxtests/psxsignal02/Makefile.am
@@ -14,7 +14,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxsignal02_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psxsignal03/Makefile.am b/testsuites/psxtests/psxsignal03/Makefile.am
index 3d3e01ea4c..b1bf1a428e 100644
--- a/testsuites/psxtests/psxsignal03/Makefile.am
+++ b/testsuites/psxtests/psxsignal03/Makefile.am
@@ -14,7 +14,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxsignal03_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psxsignal04/Makefile.am b/testsuites/psxtests/psxsignal04/Makefile.am
index edf2c2deff..d0524ec0f8 100644
--- a/testsuites/psxtests/psxsignal04/Makefile.am
+++ b/testsuites/psxtests/psxsignal04/Makefile.am
@@ -14,7 +14,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxsignal04_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psxsignal05/Makefile.am b/testsuites/psxtests/psxsignal05/Makefile.am
index 9c04045670..64894dc363 100644
--- a/testsuites/psxtests/psxsignal05/Makefile.am
+++ b/testsuites/psxtests/psxsignal05/Makefile.am
@@ -14,7 +14,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxsignal05_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psxspin01/Makefile.am b/testsuites/psxtests/psxspin01/Makefile.am
index ee232b3249..d430d7eeab 100644
--- a/testsuites/psxtests/psxspin01/Makefile.am
+++ b/testsuites/psxtests/psxspin01/Makefile.am
@@ -14,7 +14,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxspin01_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psxspin02/Makefile.am b/testsuites/psxtests/psxspin02/Makefile.am
index 4eeae611d5..b129b58ac9 100644
--- a/testsuites/psxtests/psxspin02/Makefile.am
+++ b/testsuites/psxtests/psxspin02/Makefile.am
@@ -14,7 +14,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxspin02_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psxstack01/Makefile.am b/testsuites/psxtests/psxstack01/Makefile.am
index 9580d0cef1..82ccbfc52f 100644
--- a/testsuites/psxtests/psxstack01/Makefile.am
+++ b/testsuites/psxtests/psxstack01/Makefile.am
@@ -14,7 +14,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxstack01_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psxstat/Makefile.am b/testsuites/psxtests/psxstat/Makefile.am
index 2e76209151..ff41da7e74 100644
--- a/testsuites/psxtests/psxstat/Makefile.am
+++ b/testsuites/psxtests/psxstat/Makefile.am
@@ -13,7 +13,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxstat_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psxsysconf/Makefile.am b/testsuites/psxtests/psxsysconf/Makefile.am
index 3708737802..b27f7ff91d 100644
--- a/testsuites/psxtests/psxsysconf/Makefile.am
+++ b/testsuites/psxtests/psxsysconf/Makefile.am
@@ -13,7 +13,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxsysconf_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psxtime/Makefile.am b/testsuites/psxtests/psxtime/Makefile.am
index d1f23beb61..cdf1c1a861 100644
--- a/testsuites/psxtests/psxtime/Makefile.am
+++ b/testsuites/psxtests/psxtime/Makefile.am
@@ -13,7 +13,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxtime_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
diff --git a/testsuites/psxtests/psxtimer01/Makefile.am b/testsuites/psxtests/psxtimer01/Makefile.am
index 5a2f096ca8..4f677f20e2 100644
--- a/testsuites/psxtests/psxtimer01/Makefile.am
+++ b/testsuites/psxtests/psxtimer01/Makefile.am
@@ -13,7 +13,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxtimer01_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psxtimer02/Makefile.am b/testsuites/psxtests/psxtimer02/Makefile.am
index fb1bbe713f..3dd63a2717 100644
--- a/testsuites/psxtests/psxtimer02/Makefile.am
+++ b/testsuites/psxtests/psxtimer02/Makefile.am
@@ -13,7 +13,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxtimer02_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psxualarm/Makefile.am b/testsuites/psxtests/psxualarm/Makefile.am
index 581172aca8..3acdd3aae0 100644
--- a/testsuites/psxtests/psxualarm/Makefile.am
+++ b/testsuites/psxtests/psxualarm/Makefile.am
@@ -13,7 +13,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxualarm_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
diff --git a/testsuites/psxtests/psxusleep/Makefile.am b/testsuites/psxtests/psxusleep/Makefile.am
index 7bd1ecf19a..162fc08c62 100644
--- a/testsuites/psxtests/psxusleep/Makefile.am
+++ b/testsuites/psxtests/psxusleep/Makefile.am
@@ -14,7 +14,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-psxusleep_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include