Move test support from sapi to libmisc/testsupport

9 files changed, 14 insertions, 7 deletions

diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am
index 9a78587e31..10b59db111 100644
--- a/cpukit/Makefile.am
+++ b/cpukit/Makefile.am
@@ -207,6 +207,9 @@ endif
 ## stringto
 include_rtems_HEADERS += libmisc/stringto/stringto.h
 
+## testsupport
+include_rtems_HEADERS += libmisc/testsupport/test.h
+
 ## i2c
 include_rtems_HEADERS += libi2c/libi2c.h
 
diff --git a/cpukit/libmisc/Makefile.am b/cpukit/libmisc/Makefile.am
index 8fc208f176..61def145d2 100644
--- a/cpukit/libmisc/Makefile.am
+++ b/cpukit/libmisc/Makefile.am
@@ -157,6 +157,12 @@ libstringto_a_SOURCES = stringto/stringtodouble.c stringto/stringtofloat.c \
     stringto/stringtounsignedchar.c stringto/stringtounsignedlong.c \
     stringto/stringtounsignedlonglong.c
 
+## testsupport
+noinst_LIBRARIES += libtestsupport.a
+libtestsupport_a_SOURCES =
+libtestsupport_a_SOURCES += testsupport/testbeginend.c
+libtestsupport_a_SOURCES += testsupport/testextension.c
+
 ## fsmount
 noinst_LIBRARIES += libfsmount.a
 libfsmount_a_SOURCES = fsmount/fsmount.c fsmount/fsmount.h
diff --git a/cpukit/sapi/include/rtems/test.h b/cpukit/libmisc/testsupport/test.h
index 48a33a04e5..48a33a04e5 100644
--- a/cpukit/sapi/include/rtems/test.h
+++ b/cpukit/libmisc/testsupport/test.h
diff --git a/cpukit/sapi/src/testbeginend.c b/cpukit/libmisc/testsupport/testbeginend.c
index 6383b33a78..6383b33a78 100644
--- a/cpukit/sapi/src/testbeginend.c
+++ b/cpukit/libmisc/testsupport/testbeginend.c
diff --git a/cpukit/sapi/src/testextension.c b/cpukit/libmisc/testsupport/testextension.c
index f59ae0d3ee..f59ae0d3ee 100644
--- a/cpukit/sapi/src/testextension.c
+++ b/cpukit/libmisc/testsupport/testextension.c
diff --git a/cpukit/preinstall.am b/cpukit/preinstall.am
index 527142bb20..63e39031c0 100644
--- a/cpukit/preinstall.am
+++ b/cpukit/preinstall.am
@@ -480,6 +480,10 @@ $(PROJECT_INCLUDE)/rtems/stringto.h: libmisc/stringto/stringto.h $(PROJECT_INCLU
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/stringto.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/stringto.h
 
+$(PROJECT_INCLUDE)/rtems/test.h: libmisc/testsupport/test.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/test.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/test.h
+
 $(PROJECT_INCLUDE)/rtems/libi2c.h: libi2c/libi2c.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/libi2c.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/libi2c.h
diff --git a/cpukit/sapi/Makefile.am b/cpukit/sapi/Makefile.am
index a7eaad5bbe..070800e636 100644
--- a/cpukit/sapi/Makefile.am
+++ b/cpukit/sapi/Makefile.am
@@ -19,7 +19,6 @@ include_rtems_HEADERS += include/rtems/rbheap.h
 include_rtems_HEADERS += include/rtems/rbtree.h
 include_rtems_HEADERS += include/rtems/scheduler.h
 include_rtems_HEADERS += include/rtems/sptables.h
-include_rtems_HEADERS += include/rtems/test.h
 include_rtems_HEADERS += include/rtems/timespec.h
 
 EXTRA_DIST = include/rtems/README
@@ -40,8 +39,6 @@ libsapi_a_SOURCES += src/delayticks.c
 libsapi_a_SOURCES += src/delaynano.c
 libsapi_a_SOURCES += src/profilingiterate.c
 libsapi_a_SOURCES += src/profilingreportxml.c
-libsapi_a_SOURCES += src/testbeginend.c
-libsapi_a_SOURCES += src/testextension.c
 libsapi_a_CPPFLAGS = $(AM_CPPFLAGS)
 
 include $(srcdir)/preinstall.am
diff --git a/cpukit/sapi/preinstall.am b/cpukit/sapi/preinstall.am
index f8593f4f3d..3f864bb61d 100644
--- a/cpukit/sapi/preinstall.am
+++ b/cpukit/sapi/preinstall.am
@@ -82,10 +82,6 @@ $(PROJECT_INCLUDE)/rtems/sptables.h: include/rtems/sptables.h $(PROJECT_INCLUDE)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/sptables.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/sptables.h
 
-$(PROJECT_INCLUDE)/rtems/test.h: include/rtems/test.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/test.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/test.h
-
 $(PROJECT_INCLUDE)/rtems/timespec.h: include/rtems/timespec.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/timespec.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/timespec.h
diff --git a/cpukit/wrapup/Makefile.am b/cpukit/wrapup/Makefile.am
index 6fbddb06ba..c45bf28648 100644
--- a/cpukit/wrapup/Makefile.am
+++ b/cpukit/wrapup/Makefile.am
@@ -56,6 +56,7 @@ TMP_LIBS += ../libmisc/libmouse.a
 TMP_LIBS += ../libmisc/libmw-fb.a
 TMP_LIBS += ../libmisc/libredirector.a
 TMP_LIBS += ../libmisc/libstringto.a
+TMP_LIBS += ../libmisc/libtestsupport.a
 
 if LIBUTF8PROC
 TMP_LIBS += ../libmisc/libutf8proc.a