diff options
-rw-r--r-- | cpukit/Makefile.am | 14 | ||||
-rw-r--r-- | cpukit/libtest/testbeginend.c (renamed from cpukit/libmisc/testsupport/testbeginend.c) | 0 | ||||
-rw-r--r-- | cpukit/libtest/testbusy.c (renamed from cpukit/libmisc/testsupport/testbusy.c) | 0 | ||||
-rw-r--r-- | cpukit/libtest/testextension.c (renamed from cpukit/libmisc/testsupport/testextension.c) | 0 | ||||
-rw-r--r-- | cpukit/libtest/testparallel.c (renamed from cpukit/libmisc/testsupport/testparallel.c) | 0 | ||||
-rw-r--r-- | cpukit/libtest/testwrappers.c (renamed from cpukit/libmisc/testsupport/testwrappers.c) | 0 | ||||
-rw-r--r-- | testsuites/ada/ada.am | 2 | ||||
-rw-r--r-- | testsuites/automake/compile.am | 1 |
8 files changed, 11 insertions, 6 deletions
diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am index b0b5a8d286..9e77facccb 100644 --- a/cpukit/Makefile.am +++ b/cpukit/Makefile.am @@ -322,11 +322,6 @@ librtemscpu_a_SOURCES += libmisc/stringto/stringtounsignedchar.c librtemscpu_a_SOURCES += libmisc/stringto/stringtounsignedint.c librtemscpu_a_SOURCES += libmisc/stringto/stringtounsignedlong.c librtemscpu_a_SOURCES += libmisc/stringto/stringtounsignedlonglong.c -librtemscpu_a_SOURCES += libmisc/testsupport/testbeginend.c -librtemscpu_a_SOURCES += libmisc/testsupport/testbusy.c -librtemscpu_a_SOURCES += libmisc/testsupport/testextension.c -librtemscpu_a_SOURCES += libmisc/testsupport/testparallel.c -librtemscpu_a_SOURCES += libmisc/testsupport/testwrappers.c librtemscpu_a_SOURCES += libmisc/untar/untar.c librtemscpu_a_SOURCES += libmisc/untar/untar_tgz.c librtemscpu_a_SOURCES += libmisc/untar/untar_txz.c @@ -1834,6 +1829,15 @@ project_lib_LIBRARIES += librtemsdefaultconfig.a librtemsdefaultconfig_a_SOURCES = librtemsdefaultconfig_a_SOURCES += libmisc/dummy/default-configuration.c +project_lib_LIBRARIES += librtemstest.a + +librtemstest_a_SOURCES = +librtemstest_a_SOURCES += libtest/testbeginend.c +librtemstest_a_SOURCES += libtest/testbusy.c +librtemstest_a_SOURCES += libtest/testextension.c +librtemstest_a_SOURCES += libtest/testparallel.c +librtemstest_a_SOURCES += libtest/testwrappers.c + project_lib_LIBRARIES += libftpd.a libftpd_a_SOURCES = diff --git a/cpukit/libmisc/testsupport/testbeginend.c b/cpukit/libtest/testbeginend.c index b739e47b2e..b739e47b2e 100644 --- a/cpukit/libmisc/testsupport/testbeginend.c +++ b/cpukit/libtest/testbeginend.c diff --git a/cpukit/libmisc/testsupport/testbusy.c b/cpukit/libtest/testbusy.c index 4cc8aa01fe..4cc8aa01fe 100644 --- a/cpukit/libmisc/testsupport/testbusy.c +++ b/cpukit/libtest/testbusy.c diff --git a/cpukit/libmisc/testsupport/testextension.c b/cpukit/libtest/testextension.c index be4759742e..be4759742e 100644 --- a/cpukit/libmisc/testsupport/testextension.c +++ b/cpukit/libtest/testextension.c diff --git a/cpukit/libmisc/testsupport/testparallel.c b/cpukit/libtest/testparallel.c index 1182242a7b..1182242a7b 100644 --- a/cpukit/libmisc/testsupport/testparallel.c +++ b/cpukit/libtest/testparallel.c diff --git a/cpukit/libmisc/testsupport/testwrappers.c b/cpukit/libtest/testwrappers.c index c86c4cc3f8..c86c4cc3f8 100644 --- a/cpukit/libmisc/testsupport/testwrappers.c +++ b/cpukit/libtest/testwrappers.c diff --git a/testsuites/ada/ada.am b/testsuites/ada/ada.am index 33d0c3ae2f..83260687c2 100644 --- a/testsuites/ada/ada.am +++ b/testsuites/ada/ada.am @@ -9,7 +9,7 @@ GNATCOMPILE = $(GNATMAKE) \ -bargs -Mgnat_main \ -margs $(AM_ADAFLAGS) $(ADAFLAGS) \ -cargs $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) \ --largs $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) init.o +-largs $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -lrtemstest init.o CLEANFILES += *.ali *.o b~*.adb b~*.ads diff --git a/testsuites/automake/compile.am b/testsuites/automake/compile.am index f7f0fb623f..83d4ab111c 100644 --- a/testsuites/automake/compile.am +++ b/testsuites/automake/compile.am @@ -24,5 +24,6 @@ AM_LDFLAGS += $(TEST_LD_FLAGS) LDADD = LDADD += $(RTEMS_ROOT)lib/libbsp/@RTEMS_CPU@/@RTEMS_BSP_FAMILY@/librtemsbsp.a LDADD += $(RTEMS_ROOT)cpukit/librtemscpu.a +LDADD += $(RTEMS_ROOT)cpukit/librtemstest.a CLEANFILES = *.num *.nxe *.elf *.srec* *.bin *.bt *.ralf |