Backport capability to exclude tests from building

Backported build infrastructure and .tcfg files from master.

11 files changed, 96 insertions, 31 deletions

diff --git a/testsuites/automake/test-subdirs.am b/testsuites/automake/test-subdirs.am
new file mode 100644
index 0000000000..ff339aa38d
--- /dev/null
+++ b/testsuites/automake/test-subdirs.am
@@ -0,0 +1,35 @@
+## Borrowed from automake/subdir.am which borrowed automake-1.4 and adapted to RTEMS
+
+## NOTE: This is a temporary work-around until automake is removed from RTEMS.
+##   It is a hack within many hacks and is designed to keep the source as clean
+##   as possible.
+
+all-local:
+	@set fnord $(MAKEFLAGS); amf=$$2; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	if test "$$target" = "all-local-am"; then \
+	  target="all-am"; \
+	fi; \
+	if test "$$target" = "all-local"; then \
+	  target="all"; \
+	fi; \
+	tdata="$(top_srcdir)/../../c/src/lib/libbsp/$(RTEMS_CPU)/$(RTEMS_BSP_FAMILY)/make/custom/$(RTEMS_BSP)-testsuite.tcfg"; \
+	if test -f "$$tdata"; then \
+	  vtdata="$(RTEMS_CPU)/$(RTEMS_BSP_FAMILY)/make/custom/$(RTEMS_BSP)-testsuite.cfg"; \
+	 else \
+	  vtdata="all tests"; \
+	fi; \
+	echo "BSP Testsuite Data: $$vtdata"; \
+	list=`$(top_srcdir)/../../tools/build/rtems-test-check \
+		 $$tdata $(top_srcdir)/.. $(RTEMS_BSP) $(_SUBDIRS)`; \
+	for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" != "."; then \
+	    local_target="$$target"; \
+	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	     || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  fi; \
+	done; test -z "$$fail"
+
+include $(top_srcdir)/../automake/subdirs.am
diff --git a/testsuites/itrontests/Makefile.am b/testsuites/itrontests/Makefile.am
index 05629b1da9..4cc995f76b 100644
--- a/testsuites/itrontests/Makefile.am
+++ b/testsuites/itrontests/Makefile.am
@@ -4,8 +4,8 @@
 
 ACLOCAL_AMFLAGS = -I ../aclocal
 
-SUBDIRS = itronhello itrontask01 itrontask02 itrontask03 itrontask04 \
+_SUBDIRS = itronhello itrontask01 itrontask02 itrontask03 itrontask04 \
     itronmbf01 itronmbox01 itronsem01 itrontime01
 
-include $(top_srcdir)/../automake/subdirs.am
+include $(top_srcdir)/../automake/test-subdirs.am
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/Makefile.am b/testsuites/libtests/Makefile.am
index f55a3748d2..d4efc5b917 100644
--- a/testsuites/libtests/Makefile.am
+++ b/testsuites/libtests/Makefile.am
@@ -4,15 +4,15 @@
 
 ACLOCAL_AMFLAGS = -I ../aclocal
 
-SUBDIRS = POSIX
-SUBDIRS += block12
-SUBDIRS += flashdisk01
+_SUBDIRS = POSIX
+_SUBDIRS += block12
+_SUBDIRS += flashdisk01
 
-SUBDIRS += bspcmdline01 cpuuse malloctest heapwalk putenvtest monitor \
+_SUBDIRS += bspcmdline01 cpuuse malloctest heapwalk putenvtest monitor \
     monitor02 rtmonuse stackchk stackchk01 termios termios01 termios02 \
     rtems++ tztest block01 block02 block03 block04 block05 block06 block07 \
     block08 block09 block10 stringto01
-SUBDIRS += math mathf
+_SUBDIRS += math mathf
 
-include $(top_srcdir)/../automake/subdirs.am
+include $(top_srcdir)/../automake/test-subdirs.am
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/Makefile.am b/testsuites/mptests/Makefile.am
index 9afef151c7..ba0c432688 100644
--- a/testsuites/mptests/Makefile.am
+++ b/testsuites/mptests/Makefile.am
@@ -4,8 +4,8 @@
 
 ACLOCAL_AMFLAGS = -I ../aclocal
 
-SUBDIRS = mp01 mp02 mp03 mp04 mp05 mp06 mp07 mp08 mp09 mp10 mp11 mp12 mp13 \
+_SUBDIRS = mp01 mp02 mp03 mp04 mp05 mp06 mp07 mp08 mp09 mp10 mp11 mp12 mp13 \
     mp14
 
-include $(top_srcdir)/../automake/subdirs.am
+include $(top_srcdir)/../automake/test-subdirs.am
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp02/Makefile.am b/testsuites/mptests/mp02/Makefile.am
index 4665714c9e..a9fcd4a8e7 100644
--- a/testsuites/mptests/mp02/Makefile.am
+++ b/testsuites/mptests/mp02/Makefile.am
@@ -4,5 +4,5 @@
 
 SUBDIRS = node1 node2
 
-include $(top_srcdir)/../automake/subdirs.am
+include $(top_srcdir)/../automake/test-subdirs.am
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/Makefile.am b/testsuites/psxtests/Makefile.am
index b2bfb87c98..b0a68c58f5 100644
--- a/testsuites/psxtests/Makefile.am
+++ b/testsuites/psxtests/Makefile.am
@@ -4,9 +4,9 @@
 
 ACLOCAL_AMFLAGS = -I ../aclocal
 
-SUBDIRS = psxclock
+_SUBDIRS = psxclock
 if HAS_POSIX
-SUBDIRS += psxhdrs psx01 psx02 psx03 psx04 psx05 psx06 psx07 psx08 psx09 \
+_SUBDIRS += psxhdrs psx01 psx02 psx03 psx04 psx05 psx06 psx07 psx08 psx09 \
     psx10 psx11 psx12 psx13 psx14 psx16 psxalarm01 \
     psxautoinit01 psxautoinit02 psxbarrier01 \
     psxcancel psxcancel01 psxcleanup psxcleanup01 \
@@ -19,18 +19,18 @@ SUBDIRS += psxhdrs psx01 psx02 psx03 psx04 psx05 psx06 psx07 psx08 psx09 \
 endif
 
 ## File IO tests
-SUBDIRS += psxfile01 psxreaddir psxstat psxmount psx13 psxchroot01 \
+_SUBDIRS += psxfile01 psxreaddir psxstat psxmount psx13 psxchroot01 \
   psxpasswd01
 
 ## Until sys/uio.h is moved to libcsupport, we have to have networking
 ## enabled to support readv and writev.  Hopefully this is a temporary
 ## situation.
 ## if NEWLIB
-SUBDIRS += psxrdwrv
+_SUBDIRS += psxrdwrv
 ## endif
 
 DIST_SUBDIRS = $(SUBDIRS) psxfatal_support
 EXTRA_DIST = psxfatal_support/init.c psxfatal_support/system.h
 
-include $(top_srcdir)/../automake/subdirs.am
+include $(top_srcdir)/../automake/test-subdirs.am
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/Makefile.am b/testsuites/samples/Makefile.am
index 82560d18ff..a0532aa50c 100644
--- a/testsuites/samples/Makefile.am
+++ b/testsuites/samples/Makefile.am
@@ -4,26 +4,26 @@
 
 ACLOCAL_AMFLAGS = -I ../aclocal
 
-SUBDIRS = hello capture ticker base_sp unlimited minimum fileio
+_SUBDIRS = hello capture ticker base_sp unlimited minimum fileio
 
 if MPTESTS
 ## base_mp is a sample multiprocessing test
-SUBDIRS += base_mp
+_SUBDIRS += base_mp
 endif
 
-SUBDIRS += paranoia
+_SUBDIRS += paranoia
 
-SUBDIRS += nsecs
+_SUBDIRS += nsecs
 
 if CXXTESTS
-SUBDIRS += iostream cdtest
+_SUBDIRS += iostream cdtest
 endif
 
 if NETTESTS
 ## loopback tests a network loopback interface
-SUBDIRS += loopback
-SUBDIRS += pppd
+_SUBDIRS += loopback
+_SUBDIRS += pppd
 endif
 
-include $(top_srcdir)/../automake/subdirs.am
+include $(top_srcdir)/../automake/test-subdirs.am
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/Makefile.am b/testsuites/sptests/Makefile.am
index 9f34253cd9..d17ffed57d 100644
--- a/testsuites/sptests/Makefile.am
+++ b/testsuites/sptests/Makefile.am
@@ -6,7 +6,7 @@ ACLOCAL_AMFLAGS = -I ../aclocal
 
 ## Test names are spaced to indicate gaps in numbering from tests being
 ## deleted over the years.
-SUBDIRS = \
+_SUBDIRS = \
          sp01 sp02 sp03 sp04 sp05 sp06 sp07 sp08 sp09 \
     sp10 sp11 sp12 sp13 sp14 sp15 sp16 sp17 sp18 sp19 \
     sp20 sp21 sp22 sp23 sp24 sp25 sp26 sp27 sp27a sp28 sp29 \
@@ -24,8 +24,8 @@ SUBDIRS = \
     spintrcritical13 spintrcritical14 spintrcritical15 spintrcritical16 \
     spintrcritical17
  
-DIST_SUBDIRS = $(SUBDIRS) spfatal_support spintrcritical_support
+DIST_SUBDIRS = $(_SUBDIRS) spfatal_support spintrcritical_support
 EXTRA_DIST = spfatal_support/init.c spfatal_support/system.h
 
-include $(top_srcdir)/../automake/subdirs.am
+include $(top_srcdir)/../automake/test-subdirs.am
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/testdata/disable-intrcritical-tests.tcfg b/testsuites/testdata/disable-intrcritical-tests.tcfg
new file mode 100644
index 0000000000..ef36333d18
--- /dev/null
+++ b/testsuites/testdata/disable-intrcritical-tests.tcfg
@@ -0,0 +1,30 @@
+#
+# These tests are generally unreliable on many simulators. The
+# simulation of interrupts is not accurate enough for these tests
+# to be reliable.
+#
+
+psxintrcritical01
+spintrcritical01
+spintrcritical02
+spintrcritical03
+spintrcritical04
+spintrcritical05
+spintrcritical06
+spintrcritical07
+spintrcritical08
+spintrcritical09
+spintrcritical10
+spintrcritical11
+spintrcritical12
+spintrcritical13
+spintrcritical14
+spintrcritical15
+spintrcritical16
+spintrcritical17
+spintrcritical18
+spintrcritical20
+spintrcritical21
+spintrcritical22
+spintrcritical23
+
diff --git a/testsuites/tmitrontests/Makefile.am b/testsuites/tmitrontests/Makefile.am
index 3c8833d195..f7ad5e3115 100644
--- a/testsuites/tmitrontests/Makefile.am
+++ b/testsuites/tmitrontests/Makefile.am
@@ -6,7 +6,7 @@ ACLOCAL_AMFLAGS = -I ../aclocal
 
 noinst_HEADERS = include/timesys.h
 
-SUBDIRS = tmitronsem01
+_SUBDIRS = tmitronsem01
 
-include $(top_srcdir)/../automake/subdirs.am
+include $(top_srcdir)/../automake/test-subdirs.am
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/Makefile.am b/testsuites/tmtests/Makefile.am
index 8b1f427951..1884c67585 100644
--- a/testsuites/tmtests/Makefile.am
+++ b/testsuites/tmtests/Makefile.am
@@ -4,9 +4,9 @@
 
 ACLOCAL_AMFLAGS = -I ../aclocal
 
-SUBDIRS = tmck tmoverhd tm01 tm02 tm03 tm04 tm05 tm06 tm07 tm08 tm09 tm10 \
+_SUBDIRS = tmck tmoverhd tm01 tm02 tm03 tm04 tm05 tm06 tm07 tm08 tm09 tm10 \
     tm11 tm12 tm13 tm14 tm15 tm16 tm17 tm18 tm19 tm20 tm21 tm22 tm23 tm24 \
     tm25 tm26 tm27 tm28 tm29
 
-include $(top_srcdir)/../automake/subdirs.am
+include $(top_srcdir)/../automake/test-subdirs.am
 include $(top_srcdir)/../automake/local.am