summaryrefslogtreecommitdiffstats
path: root/testsuites/libtests
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2017-04-04 08:11:24 +1000
committerChris Johns <chrisj@rtems.org>2017-04-04 08:24:22 +1000
commit258bda306ba25741624488d24a2785c055a9fab0 (patch)
tree66301d9e50cf6dbc08539b441cab8b41ffe2f895 /testsuites/libtests
parentbsp/qoriq: Fix L1 cache flush (diff)
downloadrtems-258bda306ba25741624488d24a2785c055a9fab0.tar.bz2
testsuite: Add a common test configuration. Fix configure.ac and Makefile.am errors.
- Add a top level test configuration file for test states that are common to all BSPs. This saves adding a test configuration (tcfg) file for every BSP. - Add the test states 'user-input' and 'benchmark'. This lets 'rtems-test' stop the test rather than waiting for a timeout or letting a benchmark run without the user asking for it to run. - Implement rtems-test-check in Python to make it faster. The shell script had grown to a point it was noticably slowing the build down. - Fix the configure.ac and Makefile.am files for a number of the test directories. The files are difficiult to keep in sync with the number of tests and mistakes can happen such as tests being left out of the build. The test fsrofs01 is an example. Also a there was a mix of SUBDIRS and _SUBDIRS being used and only _SUBDIRS should be used. - Fix the test fsrofs01 so it compiles. Closes #2963.
Diffstat (limited to 'testsuites/libtests')
-rw-r--r--testsuites/libtests/Makefile.am113
-rw-r--r--testsuites/libtests/configure.ac68
-rw-r--r--testsuites/libtests/dl01/Makefile.am11
-rw-r--r--testsuites/libtests/dl02/Makefile.am11
-rw-r--r--testsuites/libtests/dl04/Makefile.am11
-rw-r--r--testsuites/libtests/dl05/Makefile.am11
6 files changed, 126 insertions, 99 deletions
diff --git a/testsuites/libtests/Makefile.am b/testsuites/libtests/Makefile.am
index 286875d143..e72ca1bbaa 100644
--- a/testsuites/libtests/Makefile.am
+++ b/testsuites/libtests/Makefile.am
@@ -1,42 +1,85 @@
ACLOCAL_AMFLAGS = -I ../aclocal
-_SUBDIRS = POSIX
-_SUBDIRS += termios09
-_SUBDIRS += libfdt01
+_SUBDIRS =
+_SUBDIRS += POSIX
+_SUBDIRS += block01
+_SUBDIRS += block02
+_SUBDIRS += block03
+_SUBDIRS += block04
+_SUBDIRS += block05
+_SUBDIRS += block06
+_SUBDIRS += block07
+_SUBDIRS += block08
+_SUBDIRS += block09
+_SUBDIRS += block10
+_SUBDIRS += block11
+_SUBDIRS += block12
+_SUBDIRS += block13
+_SUBDIRS += block14
+_SUBDIRS += block15
+_SUBDIRS += block16
+_SUBDIRS += block17
+_SUBDIRS += bspcmdline01
+_SUBDIRS += capture01
+_SUBDIRS += complex
+_SUBDIRS += cpuuse
+_SUBDIRS += crypt01
_SUBDIRS += defaultconfig01
-_SUBDIRS += pwdgrp02
-_SUBDIRS += shell01
+_SUBDIRS += devfs01
+_SUBDIRS += devfs02
+_SUBDIRS += devfs03
+_SUBDIRS += devfs04
+_SUBDIRS += deviceio01
+_SUBDIRS += devnullfatal01
+_SUBDIRS += dumpbuf01
+_SUBDIRS += exit01
+_SUBDIRS += exit02
+_SUBDIRS += flashdisk01
+_SUBDIRS += gxx01
+_SUBDIRS += heapwalk
+_SUBDIRS += i2c01
+_SUBDIRS += libfdt01
+_SUBDIRS += malloc02
+_SUBDIRS += malloc03
+_SUBDIRS += malloc04
+_SUBDIRS += malloctest
+_SUBDIRS += math
+_SUBDIRS += mathf
+_SUBDIRS += mathl
+_SUBDIRS += md501
+_SUBDIRS += monitor
+_SUBDIRS += monitor02
+_SUBDIRS += mouse01
+_SUBDIRS += newlib01
+_SUBDIRS += putenvtest
_SUBDIRS += pwdgrp01
-_SUBDIRS += crypt01
+_SUBDIRS += pwdgrp02
+_SUBDIRS += rbheap01
+_SUBDIRS += rtmonuse
_SUBDIRS += sha
-_SUBDIRS += i2c01
+_SUBDIRS += shell01
+_SUBDIRS += sparsedisk01
_SUBDIRS += spi01
-_SUBDIRS += newlib01
-_SUBDIRS += block17
-_SUBDIRS += exit02
-_SUBDIRS += exit01
+_SUBDIRS += stackchk
+_SUBDIRS += stackchk01
+_SUBDIRS += stringto01
+_SUBDIRS += tar01
+_SUBDIRS += tar02
+_SUBDIRS += tar03
+_SUBDIRS += termios
+_SUBDIRS += termios01
+_SUBDIRS += termios02
+_SUBDIRS += termios03
+_SUBDIRS += termios04
+_SUBDIRS += termios05
+_SUBDIRS += termios06
+_SUBDIRS += termios07
+_SUBDIRS += termios08
+_SUBDIRS += termios09
+_SUBDIRS += top
+_SUBDIRS += tztest
+_SUBDIRS += uid01
_SUBDIRS += utf8proc01
-_SUBDIRS += md501
-_SUBDIRS += sparsedisk01
-_SUBDIRS += block16
-_SUBDIRS += block15
-_SUBDIRS += block14
-_SUBDIRS += block13
-_SUBDIRS += rbheap01
-_SUBDIRS += flashdisk01
-_SUBDIRS += capture01
-
-_SUBDIRS += bspcmdline01 cpuuse devfs01 devfs02 devfs03 devfs04 \
- deviceio01 devnullfatal01 dumpbuf01 gxx01 top\
- malloctest malloc02 malloc03 malloc04 heapwalk \
- putenvtest monitor monitor02 rtmonuse stackchk stackchk01 \
- termios termios01 termios02 termios03 termios04 termios05 \
- termios06 termios07 termios08 \
- tztest block01 block02 block03 block04 block05 block06 block07 \
- block08 block09 block10 block11 block12 stringto01 \
- tar01 tar02 tar03 \
- math mathf mathl complex \
- mouse01 uid01
if NETTESTS
if HAS_POSIX
@@ -47,6 +90,10 @@ _SUBDIRS += networking01
_SUBDIRS += syscall01
endif
+##
+## The libdl use use AM's BUILT_SOURCE and this has a weird side effect of
+## restarting the subdir loop. No idea why.
+##
if DLTESTS
_SUBDIRS += dl01 dl02 dl03
if HAS_CXX
@@ -58,5 +105,5 @@ if DEBUGGERTESTS
_SUBDIRS += debugger01
endif
-include $(top_srcdir)/../automake/test-subdirs.am
+include $(top_srcdir)/../automake/subdirs.am
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/configure.ac b/testsuites/libtests/configure.ac
index 4e82caff18..bbdf4df9d1 100644
--- a/testsuites/libtests/configure.ac
+++ b/testsuites/libtests/configure.ac
@@ -93,31 +93,7 @@ AM_CONDITIONAL(DEBUGGERTESTS,[test x"$TEST_LIBDEBUGGER" = x"yes"])
# Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile
-networking01/Makefile
-libfdt01/Makefile
-defaultconfig01/Makefile
-pwdgrp02/Makefile
-shell01/Makefile
-pwdgrp01/Makefile
-crypt01/Makefile
-sha/Makefile
-i2c01/Makefile
-spi01/Makefile
-newlib01/Makefile
-block17/Makefile
-exit02/Makefile
-exit01/Makefile
-utf8proc01/Makefile
-md501/Makefile
-sparsedisk01/Makefile
-block16/Makefile
-mghttpd01/Makefile
-block15/Makefile
-block14/Makefile
-block13/Makefile
-rbheap01/Makefile
-syscall01/Makefile
-flashdisk01/Makefile
+POSIX/Makefile
block01/Makefile
block02/Makefile
block03/Makefile
@@ -130,8 +106,18 @@ block09/Makefile
block10/Makefile
block11/Makefile
block12/Makefile
+block13/Makefile
+block14/Makefile
+block15/Makefile
+block16/Makefile
+block17/Makefile
bspcmdline01/Makefile
+capture01/Makefile
+complex/Makefile
cpuuse/Makefile
+crypt01/Makefile
+debugger01/Makefile
+defaultconfig01/Makefile
devfs01/Makefile
devfs02/Makefile
devfs03/Makefile
@@ -144,22 +130,41 @@ dl03/Makefile
dl04/Makefile
dl05/Makefile
dumpbuf01/Makefile
+exit01/Makefile
+exit02/Makefile
+flashdisk01/Makefile
ftp01/Makefile
gxx01/Makefile
heapwalk/Makefile
-malloctest/Makefile
+i2c01/Makefile
+libfdt01/Makefile
malloc02/Makefile
malloc03/Makefile
malloc04/Makefile
+malloctest/Makefile
+math/Makefile
+mathf/Makefile
+mathl/Makefile
+md501/Makefile
+mghttpd01/Makefile
monitor/Makefile
monitor02/Makefile
mouse01/Makefile
-uid01/Makefile
+networking01/Makefile
+newlib01/Makefile
putenvtest/Makefile
+pwdgrp01/Makefile
+pwdgrp02/Makefile
+rbheap01/Makefile
rtmonuse/Makefile
+sha/Makefile
+shell01/Makefile
+sparsedisk01/Makefile
+spi01/Makefile
stackchk/Makefile
stackchk01/Makefile
stringto01/Makefile
+syscall01/Makefile
tar01/Makefile
tar02/Makefile
tar03/Makefile
@@ -175,12 +180,7 @@ termios08/Makefile
termios09/Makefile
top/Makefile
tztest/Makefile
-capture01/Makefile
-POSIX/Makefile
-math/Makefile
-mathf/Makefile
-mathl/Makefile
-complex/Makefile
-debugger01/Makefile
+uid01/Makefile
+utf8proc01/Makefile
])
AC_OUTPUT
diff --git a/testsuites/libtests/dl01/Makefile.am b/testsuites/libtests/dl01/Makefile.am
index d7c9a0d507..07460694e2 100644
--- a/testsuites/libtests/dl01/Makefile.am
+++ b/testsuites/libtests/dl01/Makefile.am
@@ -29,14 +29,9 @@ dl-tar.h: dl.tar
$(BIN2C) -H $< $@
CLEANFILES += dl-tar.h
-dl01.pre$(EXEEXT): $(dl01_OBJECTS) $(dl01_DEPENDENCIES)
- @rm -f dl01.pre$(EXEEXT)
- $(make-exe)
- rm -f dl01.pre.ralf
-
-dl01.pre: dl01.pre$(EXEEXT)
- mv $< $@
-CLEANFILES += dl01.pre
+dl01.pre: $(dl01_OBJECTS) $(dl01_DEPENDENCIES)
+ @rm -f dl01.pre
+ $(LINK_APP)
dl-sym.o: dl01.pre
rtems-syms -e -c "$(CFLAGS)" -o $@ $<
diff --git a/testsuites/libtests/dl02/Makefile.am b/testsuites/libtests/dl02/Makefile.am
index 39a8efe82a..52ef98dc8a 100644
--- a/testsuites/libtests/dl02/Makefile.am
+++ b/testsuites/libtests/dl02/Makefile.am
@@ -31,14 +31,9 @@ dl-tar.h: dl.tar
$(BIN2C) -H $< $@
CLEANFILES += dl-tar.h
-dl02.pre$(EXEEXT): $(dl02_OBJECTS) $(dl02_DEPENDENCIES)
- @rm -f dl02.pre$(EXEEXT)
- $(make-exe)
- rm -f dl02.pre.ralf
-
-dl02.pre: dl02.pre$(EXEEXT)
- mv $< $@
-CLEANFILES += dl02.pre
+dl02.pre: $(dl02_OBJECTS) $(dl02_DEPENDENCIES)
+ @rm -f dl02.pre
+ $(LINK_APP)
dl-sym.o: dl02.pre
rtems-syms -e -c "$(CFLAGS)" -o $@ $<
diff --git a/testsuites/libtests/dl04/Makefile.am b/testsuites/libtests/dl04/Makefile.am
index d45bc87c4d..a888434770 100644
--- a/testsuites/libtests/dl04/Makefile.am
+++ b/testsuites/libtests/dl04/Makefile.am
@@ -30,14 +30,9 @@ dl-tar.h: dl.tar
$(BIN2C) -H $< $@
CLEANFILES += dl-tar.h
-dl04.pre$(EXEEXT): $(dl04_OBJECTS) $(dl04_DEPENDENCIES)
- @rm -f dl04.pre$(EXEEXT)
- $(make-exe)
- rm -f dl04.pre.ralf
-
-dl04.pre: dl04.pre$(EXEEXT)
- mv $< $@
-CLEANFILES += dl04.pre
+dl04.pre: $(dl04_OBJECTS) $(dl04_DEPENDENCIES)
+ @rm -f dl04.pre
+ $(LINK_APP)
dl-sym.o: dl04.pre
rtems-syms -e -c "$(CFLAGS)" -o $@ $<
diff --git a/testsuites/libtests/dl05/Makefile.am b/testsuites/libtests/dl05/Makefile.am
index d63f355c76..15608cd3c6 100644
--- a/testsuites/libtests/dl05/Makefile.am
+++ b/testsuites/libtests/dl05/Makefile.am
@@ -29,15 +29,10 @@ dl-tar.h: dl.tar
$(BIN2C) -H $< $@
CLEANFILES += dl-tar.h
-dl05.pre$(EXEEXT): $(dl05_OBJECTS) $(dl05_DEPENDENCIES)
- @rm -f dl05.pre$(EXEEXT)
+dl05.pre: $(dl05_OBJECTS) $(dl05_DEPENDENCIES)
+ @rm -f dl05.pre
$(LINK.cc) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) \
- -o $(basename $@)$(EXEEXT) $(LINK_OBJS) $(LINK_LIBS)
- rm -f dl05.pre.ralf
-
-dl05.pre: dl05.pre$(EXEEXT)
- mv $< $@
-CLEANFILES += dl05.pre
+ -o $@ $(LINK_OBJS) $(LINK_LIBS)
dl-sym.o: dl05.pre
rtems-syms -e -c "$(CFLAGS)" -o $@ $<