summaryrefslogtreecommitdiffstats
path: root/testsuites/psxtests
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/psxtests
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/psxtests')
-rw-r--r--testsuites/psxtests/Makefile.am147
-rw-r--r--testsuites/psxtests/configure.ac4
2 files changed, 117 insertions, 34 deletions
diff --git a/testsuites/psxtests/Makefile.am b/testsuites/psxtests/Makefile.am
index a00aea40d5..584e8c5753 100644
--- a/testsuites/psxtests/Makefile.am
+++ b/testsuites/psxtests/Makefile.am
@@ -1,48 +1,131 @@
ACLOCAL_AMFLAGS = -I ../aclocal
-_SUBDIRS = psxclock
-_SUBDIRS += psxthreadname01
+## Some of the tests need other POSIX features to work while some do not.
+
+_SUBDIRS =
if HAS_POSIX
-_SUBDIRS += psxhdrs psx01 psx02 psx03 psx04 psx05 psx06 psx07 psx08 psx09 \
- psx10 psx11 psx12 psx13 psx14 psx15 psx16 \
- psxaio01 psxaio02 psxaio03 \
- psxalarm01 psxautoinit01 psxautoinit02 psxbarrier01 \
- psxcancel psxcancel01 psxclassic01 psxcleanup psxcleanup01 \
- psxconcurrency01 psxcond01 psxcond02 psxconfig01 psxenosys \
- psxitimer psxmsgq01 psxmsgq02 psxmsgq03 psxmsgq04 \
- psxmutexattr01 psxobj01 psxrwlock01 psxsem01 psxshm01 psxshm02 \
- psxsignal01 psxsignal02 psxsignal03 psxsignal04 psxsignal05 psxsignal06 \
- psxspin01 psxstrsignal01 psxsysconf \
- psxtime psxtimer01 psxtimer02 psxualarm psxusleep psxfatal01 psxfatal02 \
- psxintrcritical01 psxstack01 psxstack02 \
- psxeintr_join psxgetattrnp01 psxclock01
+_SUBDIRS += psx01
+_SUBDIRS += psx02
+_SUBDIRS += psx03
+_SUBDIRS += psx04
+_SUBDIRS += psx05
+_SUBDIRS += psx06
+_SUBDIRS += psx07
+_SUBDIRS += psx08
+_SUBDIRS += psx09
+_SUBDIRS += psx10
+_SUBDIRS += psx11
+_SUBDIRS += psx12
+_SUBDIRS += psx14
+_SUBDIRS += psx15
+_SUBDIRS += psx16
+_SUBDIRS += psxaio01
+_SUBDIRS += psxaio02
+_SUBDIRS += psxaio03
+_SUBDIRS += psxalarm01
+_SUBDIRS += psxautoinit01
+_SUBDIRS += psxautoinit02
+_SUBDIRS += psxbarrier01
+_SUBDIRS += psxcancel
+_SUBDIRS += psxcancel01
+_SUBDIRS += psxclassic01
+_SUBDIRS += psxcleanup
+_SUBDIRS += psxcleanup01
_SUBDIRS += psxcleanup02
+endif
+_SUBDIRS += psxclock
+if HAS_POSIX
+_SUBDIRS += psxclock01
+_SUBDIRS += psxconcurrency01
+_SUBDIRS += psxcond01
+_SUBDIRS += psxcond02
+_SUBDIRS += psxconfig01
+endif
+_SUBDIRS += psxdevctl01
+if HAS_POSIX
+_SUBDIRS += psxeintr_join
+_SUBDIRS += psxenosys
+_SUBDIRS += psxfatal01
+_SUBDIRS += psxfatal02
+endif
+if HAS_POSIX
if HAS_CPLUSPLUS
_SUBDIRS += psxglobalcon01
_SUBDIRS += psxglobalcon02
endif
+_SUBDIRS += psxhdrs
+_SUBDIRS += psxintrcritical01
+_SUBDIRS += psxitimer
endif
-
-## File IO tests
-_SUBDIRS += psxfile01 psxfile02 psxfilelock01 psxgetrusage01 psxid01 \
- psximfs01 psximfs02 psxreaddir psxstat psxmount psx13 psxchroot01 \
- psxpasswd01 psxpasswd02 psxpipe01 psxtimes01 psxfchx01
-
-## POSIX Devctl tests
-_SUBDIRS += psxdevctl01
-
-## POSIX Keys are always available
-_SUBDIRS += psxkey01 psxkey02 psxkey03 psxkey04 \
- psxkey05 psxkey06 psxkey08 psxkey09 psxkey10
-## But some of the tests need other POSIX features
+_SUBDIRS += psxkey01
+_SUBDIRS += psxkey02
+_SUBDIRS += psxkey03
+_SUBDIRS += psxkey04
+_SUBDIRS += psxkey05
+_SUBDIRS += psxkey06
if HAS_POSIX
_SUBDIRS += psxkey07
endif
-
-## POSIX Once is always available
+_SUBDIRS += psxkey08
+_SUBDIRS += psxkey09
+_SUBDIRS += psxkey10
+if HAS_POSIX
+_SUBDIRS += psxmsgq01
+_SUBDIRS += psxmsgq02
+_SUBDIRS += psxmsgq03
+_SUBDIRS += psxmsgq04
+_SUBDIRS += psxmutexattr01
+_SUBDIRS += psxobj01
+endif
_SUBDIRS += psxonce01
-
_SUBDIRS += psxrdwrv
+if HAS_POSIX
+_SUBDIRS += psxrwlock01
+_SUBDIRS += psxsem01
+_SUBDIRS += psxshm01
+_SUBDIRS += psxshm02
+_SUBDIRS += psxsignal01
+_SUBDIRS += psxsignal02
+_SUBDIRS += psxsignal03
+_SUBDIRS += psxsignal04
+_SUBDIRS += psxsignal05
+_SUBDIRS += psxsignal06
+_SUBDIRS += psxspin01
+_SUBDIRS += psxstack01
+_SUBDIRS += psxstack02
+_SUBDIRS += psxstrsignal01
+_SUBDIRS += psxsysconf
+endif
+_SUBDIRS += psxthreadname01
+if HAS_POSIX
+_SUBDIRS += psxtime
+_SUBDIRS += psxtimer01
+_SUBDIRS += psxtimer02
+_SUBDIRS += psxualarm
+_SUBDIRS += psxusleep
+endif
+
+
+
+## File IO tests
+_SUBDIRS += psx13
+_SUBDIRS += psxchroot01
+_SUBDIRS += psxfile01
+_SUBDIRS += psxfile02
+_SUBDIRS += psxfilelock01
+_SUBDIRS += psxgetattrnp01
+_SUBDIRS += psxgetrusage01
+_SUBDIRS += psxid01
+_SUBDIRS += psximfs01
+_SUBDIRS += psximfs02
+_SUBDIRS += psxmount
+_SUBDIRS += psxpasswd01
+_SUBDIRS += psxpasswd02
+_SUBDIRS += psxpipe01
+_SUBDIRS += psxreaddir
+_SUBDIRS += psxstat
+_SUBDIRS += psxtimes01
+_SUBDIRS += psxfchx01
-include $(top_srcdir)/../automake/test-subdirs.am
+include $(top_srcdir)/../automake/subdirs.am
include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/configure.ac b/testsuites/psxtests/configure.ac
index 3211a8d380..1de1312984 100644
--- a/testsuites/psxtests/configure.ac
+++ b/testsuites/psxtests/configure.ac
@@ -184,8 +184,8 @@ psxonce01/Makefile
psxpasswd01/Makefile
psxpasswd02/Makefile
psxpipe01/Makefile
-psxreaddir/Makefile
psxrdwrv/Makefile
+psxreaddir/Makefile
psxrwlock01/Makefile
psxsem01/Makefile
psxshm01/Makefile
@@ -202,11 +202,11 @@ psxstack02/Makefile
psxstat/Makefile
psxstrsignal01/Makefile
psxsysconf/Makefile
+psxthreadname01/Makefile
psxtime/Makefile
psxtimer01/Makefile
psxtimer02/Makefile
psxtimes01/Makefile
-psxthreadname01/Makefile
psxualarm/Makefile
psxusleep/Makefile
])