testsuite: Add a per BSP test check for tests not to build.

Provide a file per BSP to list tests that do not build for a BSP. This change removes the BSP_SMALL_MEMORY hack from the code. That hack was a mistake. Provide configuration files for each BSP with tests that cannot build.
2014-05-05 08:12:52 +10:00
parent b0e83e1207
commit 1461b648b7
39 changed files with 613 additions and 110 deletions
--- a/c/src/lib/libbsp/arm/lm3s69xx/make/custom/lm3s3749-testsuite.tcfg
+++ b/c/src/lib/libbsp/arm/lm3s69xx/make/custom/lm3s3749-testsuite.tcfg
@@ -0,0 +1,29 @@
+#
+# lm3s3749 RTEMS Test Database.
+#
+# Format is one line per test that is _NOT_ built.
+#
+
+capture
+fileio
+flashdisk01
+fsdosfsname01
+fsrfsbitmap01
+jffs2_fserror
+jffs2_fslink
+jffs2_fspatheval
+jffs2_fspermission
+jffs2_fsrdwr
+jffs2_fssymlink
+jffs2_fstime
+mdosfs_fserror
+monitor02
+mrfs_fserror
+mrfs_fsfpathconf
+mrfs_fslink
+mrfs_fspatheval
+mrfs_fspermission
+mrfs_fsrdwr
+mrfs_fssymlink
+mrfs_fstime
+utf8proc01
--- a/c/src/lib/libbsp/arm/lm3s69xx/make/custom/lm3s6965-testsuite.tcfg
+++ b/c/src/lib/libbsp/arm/lm3s69xx/make/custom/lm3s6965-testsuite.tcfg
@@ -0,0 +1,18 @@
+#
+# lm3s6965 RTEMS Test Database.
+#
+# Format is one line per test that is _NOT_ built.
+#
+
+fileio
+flashdisk01
+fsdosfsname01
+jffs2_fserror
+jffs2_fslink
+jffs2_fspatheval
+jffs2_fspermission
+jffs2_fsrdwr
+jffs2_fssymlink
+jffs2_fstime
+monitor02
+utf8proc01
--- a/c/src/lib/libbsp/arm/lm3s69xx/make/custom/lm4f120-testsuite.tcfg
+++ b/c/src/lib/libbsp/arm/lm3s69xx/make/custom/lm4f120-testsuite.tcfg
@@ -0,0 +1,22 @@
+#
+# lm4f120 RTEMS Test Database.
+#
+# Format is one line per test that is _NOT_ built.
+#
+
+fileio
+flashdisk01
+fsdosfsname01
+jffs2_fserror
+jffs2_fslink
+jffs2_fspatheval
+jffs2_fspermission
+jffs2_fsrdwr
+jffs2_fssymlink
+jffs2_fstime
+monitor02
+sp16
+sp25
+sp48
+spstkalloc02
+utf8proc01
--- a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc17xx_ea_rom_int-testsuite.tcfg
+++ b/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc17xx_ea_rom_int-testsuite.tcfg
@@ -0,0 +1,7 @@
+#
+# lpc17xx_ea_rom_int RTEMS Test Database.
+#
+# Format is one line per test that is _NOT_ built.
+#
+
+fsdosfsname01
--- a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc17xx_plx800_rom_int-testsuite.tcfg
+++ b/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc17xx_plx800_rom_int-testsuite.tcfg
@@ -0,0 +1,7 @@
+#
+# lpc17xx_plx800_rom_int RTEMS Test Database.
+#
+# Format is one line per test that is _NOT_ built.
+#
+
+fsdosfsname01
--- a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc2362-testsuite.tcfg
+++ b/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc2362-testsuite.tcfg
@@ -0,0 +1,30 @@
+#
+# lpc2362 RTEMS Test Database.
+#
+# Format is one line per test that is _NOT_ built.
+#
+
+capture
+fileio
+flashdisk01
+fsdosfsname01
+fsrfsbitmap01
+jffs2_fserror
+jffs2_fslink
+jffs2_fspatheval
+jffs2_fspermission
+jffs2_fsrdwr
+jffs2_fssymlink
+jffs2_fstime
+mdosfs_fserror
+monitor02
+mrfs_fserror
+mrfs_fsfpathconf
+mrfs_fslink
+mrfs_fspatheval
+mrfs_fspermission
+mrfs_fsrdwr
+mrfs_fssymlink
+mrfs_fstime
+spstkalloc02
+utf8proc01
--- a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc23xx_tli800-testsuite.tcfg
+++ b/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc23xx_tli800-testsuite.tcfg
@@ -0,0 +1,32 @@
+#
+# lpc23xx_tli800 RTEMS Test Database.
+#
+# Format is one line per test that is _NOT_ built.
+#
+
+capture
+fileio
+flashdisk01
+fsdosfsformat01
+fsdosfsname01
+fsrfsbitmap01
+jffs2_fserror
+jffs2_fslink
+jffs2_fspatheval
+jffs2_fspermission
+jffs2_fsrdwr
+jffs2_fssymlink
+jffs2_fstime
+mdosfs_fserror
+monitor02
+mrfs_fserror
+mrfs_fsfpathconf
+mrfs_fslink
+mrfs_fspatheval
+mrfs_fspermission
+mrfs_fsrdwr
+mrfs_fssymlink
+mrfs_fstime
+paranoia
+spstkalloc02
+utf8proc01
--- a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc24xx_ncs_rom_int-testsuite.tcfg
+++ b/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc24xx_ncs_rom_int-testsuite.tcfg
@@ -0,0 +1,7 @@
+#
+# lpc24xx_ncs_rom_int RTEMS Test Database.
+#
+# Format is one line per test that is _NOT_ built.
+#
+
+fsdosfsname01
--- a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc24xx_plx800_rom_int-testsuite.tcfg
+++ b/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc24xx_plx800_rom_int-testsuite.tcfg
@@ -0,0 +1,7 @@
+#
+# lpc24xx_plx800_rom_int RTEMS Test Database.
+#
+# Format is one line per test that is _NOT_ built.
+#
+
+fsdosfsname01
--- a/c/src/lib/libbsp/arm/lpc32xx/make/custom/lpc32xx_mzx_stage_1-testsuite.tcfg
+++ b/c/src/lib/libbsp/arm/lpc32xx/make/custom/lpc32xx_mzx_stage_1-testsuite.tcfg
@@ -0,0 +1,17 @@
+#
+# lpc32xx_mzx_stage_1 RTEMS Test Database.
+#
+# Format is one line per test that is _NOT_ built.
+#
+
+fileio
+fsdosfsname01
+jffs2_fserror
+jffs2_fslink
+jffs2_fspatheval
+jffs2_fspermission
+jffs2_fsrdwr
+jffs2_fssymlink
+jffs2_fstime
+monitor02
+utf8proc01
--- a/c/src/lib/libbsp/arm/rtl22xx/make/custom/rtl22xx-testsuite.tcfg
+++ b/c/src/lib/libbsp/arm/rtl22xx/make/custom/rtl22xx-testsuite.tcfg
@@ -0,0 +1,8 @@
+#
+# rtl22xx RTEMS Test Database.
+#
+# Format is one line per test that is _NOT_ built.
+#
+
+fsdosfsname01
+utf8proc01
--- a/c/src/lib/libbsp/arm/rtl22xx/make/custom/rtl22xx_t-testsuite.tcfg
+++ b/c/src/lib/libbsp/arm/rtl22xx/make/custom/rtl22xx_t-testsuite.tcfg
@@ -0,0 +1,7 @@
+#
+# rtl22xx_t RTEMS Test Database.
+#
+# Format is one line per test that is _NOT_ built.
+#
+
+fsdosfsname01
--- a/c/src/lib/libbsp/arm/stm32f4/make/custom/stm32f105rc-testsuite.tcfg
+++ b/c/src/lib/libbsp/arm/stm32f4/make/custom/stm32f105rc-testsuite.tcfg
@@ -0,0 +1,18 @@
+#
+# stm32f105rc RTEMS Test Database.
+#
+# Format is one line per test that is _NOT_ built.
+#
+
+fileio
+flashdisk01
+fsdosfsname01
+jffs2_fserror
+jffs2_fslink
+jffs2_fspatheval
+jffs2_fspermission
+jffs2_fsrdwr
+jffs2_fssymlink
+jffs2_fstime
+monitor02
+utf8proc01
--- a/c/src/lib/libbsp/arm/stm32f4/make/custom/stm32f4-testsuite.tcfg
+++ b/c/src/lib/libbsp/arm/stm32f4/make/custom/stm32f4-testsuite.tcfg
@@ -0,0 +1,14 @@
+#
+# stm32f4 RTEMS Test Database.
+#
+# Format is one line per test that is _NOT_ built.
+#
+
+fsdosfsname01
+jffs2_fserror
+jffs2_fslink
+jffs2_fspatheval
+jffs2_fspermission
+jffs2_fsrdwr
+jffs2_fssymlink
+jffs2_fstime
--- a/c/src/lib/libbsp/m68k/mcf52235/make/custom/mcf52235-testsuite.tcfg
+++ b/c/src/lib/libbsp/m68k/mcf52235/make/custom/mcf52235-testsuite.tcfg
@@ -0,0 +1,27 @@
+#
+# MCF52235 RTEMS Test Database.
+#
+# Format is one line per test that is _NOT_ built.
+#
+
+capture
+fileio
+flashdisk01
+fsdosfsformat01
+fsdosfsname01
+ftp01
+iostream
+jffs2_fserror
+jffs2_fslink
+jffs2_fspatheval
+jffs2_fspermission
+jffs2_fsrdwr
+jffs2_fssymlink
+jffs2_fstime
+loopback
+mghttpd01
+monitor02
+paranoia
+pppd
+spstkalloc02
+utf8proc01
--- a/c/src/lib/libbsp/m68k/mcf5225x/make/custom/mcf5225x-testsuite.tcfg
+++ b/c/src/lib/libbsp/m68k/mcf5225x/make/custom/mcf5225x-testsuite.tcfg
@@ -0,0 +1,15 @@
+#
+# mcf5225x RTEMS Test Database.
+#
+# Format is one line per test that is _NOT_ built.
+#
+
+flashdisk01
+fsdosfsname01
+jffs2_fserror
+jffs2_fslink
+jffs2_fspatheval
+jffs2_fspermission
+jffs2_fsrdwr
+jffs2_fssymlink
+jffs2_fstime
--- a/c/src/lib/libbsp/m68k/mrm332/make/custom/mrm332-testsuite.tcfg
+++ b/c/src/lib/libbsp/m68k/mrm332/make/custom/mrm332-testsuite.tcfg
@@ -0,0 +1,9 @@
+#
+# mrm332 RTEMS Test Database.
+#
+# Format is one line per test that is _NOT_ built.
+#
+
+fsdosfsname01
+sptls01
+utf8proc01
--- a/c/src/lib/libbsp/m68k/ods68302/make/custom/ods68302-testsuite.tcfg
+++ b/c/src/lib/libbsp/m68k/ods68302/make/custom/ods68302-testsuite.tcfg
@@ -0,0 +1,8 @@
+#
+# ods68302 RTEMS Test Database.
+#
+# Format is one line per test that is _NOT_ built.
+#
+
+fsdosfsname01
+utf8proc01
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/gwlcfm-testsuite.tcfg
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/gwlcfm-testsuite.tcfg
@@ -0,0 +1,14 @@
+#
+# gwlcfm RTEMS Test Database.
+#
+# Format is one line per test that is _NOT_ built.
+#
+
+fsdosfsname01
+jffs2_fserror
+jffs2_fslink
+jffs2_fspatheval
+jffs2_fspermission
+jffs2_fsrdwr
+jffs2_fssymlink
+jffs2_fstime
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5566evb-testsuite.tcfg
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5566evb-testsuite.tcfg
@@ -0,0 +1,14 @@
+#
+# mpc5566evb RTEMS Test Database.
+#
+# Format is one line per test that is _NOT_ built.
+#
+
+fsdosfsname01
+jffs2_fserror
+jffs2_fslink
+jffs2_fspatheval
+jffs2_fspermission
+jffs2_fsrdwr
+jffs2_fssymlink
+jffs2_fstime
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5566evb_spe-testsuite.tcfg
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5566evb_spe-testsuite.tcfg
@@ -0,0 +1,14 @@
+#
+# mpc5566evb_spe RTEMS Test Database.
+#
+# Format is one line per test that is _NOT_ built.
+#
+
+fsdosfsname01
+jffs2_fserror
+jffs2_fslink
+jffs2_fspatheval
+jffs2_fspermission
+jffs2_fsrdwr
+jffs2_fssymlink
+jffs2_fstime
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5643l_dpu-testsuite.tcfg
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5643l_dpu-testsuite.tcfg
@@ -0,0 +1,16 @@
+#
+# mpc5643l_dpu RTEMS Test Database.
+#
+# Format is one line per test that is _NOT_ built.
+#
+
+flashdisk01
+fsdosfsname01
+jffs2_fserror
+jffs2_fslink
+jffs2_fspatheval
+jffs2_fspermission
+jffs2_fsrdwr
+jffs2_fssymlink
+jffs2_fstime
+spstkalloc02
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5643l_evb-testsuite.tcfg
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5643l_evb-testsuite.tcfg
@@ -0,0 +1,16 @@
+#
+# mpc5643l_evb RTEMS Test Database.
+#
+# Format is one line per test that is _NOT_ built.
+#
+
+flashdisk01
+fsdosfsname01
+jffs2_fserror
+jffs2_fslink
+jffs2_fspatheval
+jffs2_fspermission
+jffs2_fsrdwr
+jffs2_fssymlink
+jffs2_fstime
+spstkalloc02
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5674f_ecu508_boot-testsuite.tcfg
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5674f_ecu508_boot-testsuite.tcfg
@@ -0,0 +1,7 @@
+#
+# mpc5674f_ecu508_boot RTEMS Test Database.
+#
+# Format is one line per test that is _NOT_ built.
+#
+
+fsdosfsname01
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5674f_rsm6-testsuite.tcfg
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5674f_rsm6-testsuite.tcfg
@@ -0,0 +1,7 @@
+#
+# mpc5674f_rsm6 RTEMS Test Database.
+#
+# Format is one line per test that is _NOT_ built.
+#
+
+fsdosfsname01
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/phycore_mpc5554-testsuite.tcfg
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/phycore_mpc5554-testsuite.tcfg
@@ -0,0 +1,14 @@
+#
+# phycore_mpc5554 RTEMS Test Database.
+#
+# Format is one line per test that is _NOT_ built.
+#
+
+fsdosfsname01
+jffs2_fserror
+jffs2_fslink
+jffs2_fspatheval
+jffs2_fspermission
+jffs2_fsrdwr
+jffs2_fssymlink
+jffs2_fstime
--- a/c/src/lib/libbsp/sh/gensh1/make/custom/gensh1-testsuite.tcfg
+++ b/c/src/lib/libbsp/sh/gensh1/make/custom/gensh1-testsuite.tcfg
@@ -0,0 +1,8 @@
+#
+# gensh1 RTEMS Test Database.
+#
+# Format is one line per test that is _NOT_ built.
+#
+
+fsdosfsname01
+utf8proc01
--- a/c/src/lib/libbsp/sh/gensh2/make/custom/gensh2-testsuite.tcfg
+++ b/c/src/lib/libbsp/sh/gensh2/make/custom/gensh2-testsuite.tcfg
@@ -0,0 +1,8 @@
+#
+# gensh2 RTEMS Test Database.
+#
+# Format is one line per test that is _NOT_ built.
+#
+
+fsdosfsname01
+utf8proc01
--- a/c/src/lib/libbsp/sh/shsim/make/custom/simsh1-testsuite.tcfg
+++ b/c/src/lib/libbsp/sh/shsim/make/custom/simsh1-testsuite.tcfg
@@ -0,0 +1,8 @@
+#
+# simsh1 RTEMS Test Database.
+#
+# Format is one line per test that is _NOT_ built.
+#
+
+fsdosfsname01
+utf8proc01
--- a/c/src/lib/libbsp/sh/shsim/make/custom/simsh2-testsuite.tcfg
+++ b/c/src/lib/libbsp/sh/shsim/make/custom/simsh2-testsuite.tcfg
@@ -0,0 +1,8 @@
+#
+# simsh2 RTEMS Test Database.
+#
+# Format is one line per test that is _NOT_ built.
+#
+
+fsdosfsname01
+utf8proc01
--- a/testsuites/automake/test-subdirs.am
+++ 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 $(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
--- a/testsuites/fstests/Makefile.am
+++ b/testsuites/fstests/Makefile.am
@@ -1,49 +1,49 @@
 ACLOCAL_AMFLAGS = -I ../aclocal

-SUBDIRS = 
-SUBDIRS += fsdosfsname01
-SUBDIRS += fsdosfswrite01
-SUBDIRS += fsdosfsformat01
-SUBDIRS += fsfseeko01
-SUBDIRS += fsdosfssync01
-SUBDIRS += imfs_fserror
-SUBDIRS += imfs_fslink
-SUBDIRS += imfs_fspatheval
-SUBDIRS += imfs_fspermission
-SUBDIRS += imfs_fsrdwr
-SUBDIRS += imfs_fssymlink
-SUBDIRS += imfs_fstime
-SUBDIRS += jffs2_fserror
-SUBDIRS += jffs2_fslink
-SUBDIRS += jffs2_fspatheval
-SUBDIRS += jffs2_fspermission
-SUBDIRS += jffs2_fsrdwr
-SUBDIRS += jffs2_fssymlink
-SUBDIRS += jffs2_fstime
-SUBDIRS += mdosfs_fserror
-SUBDIRS += mdosfs_fspatheval
-SUBDIRS += mdosfs_fsrdwr
-SUBDIRS += mdosfs_fsstatvfs
-SUBDIRS += mimfs_fserror
-SUBDIRS += mimfs_fslink
-SUBDIRS += mimfs_fspatheval
-SUBDIRS += mimfs_fspermission
-SUBDIRS += mimfs_fsrdwr
-SUBDIRS += mimfs_fssymlink
-SUBDIRS += mimfs_fstime
-SUBDIRS += mimfs_fsrename
-SUBDIRS += mrfs_fserror
-SUBDIRS += mrfs_fslink
-SUBDIRS += mrfs_fspatheval
-SUBDIRS += mrfs_fspermission
-SUBDIRS += mrfs_fsrdwr
-SUBDIRS += mrfs_fssymlink
-SUBDIRS += mrfs_fstime
-SUBDIRS += mrfs_fsfpathconf
-SUBDIRS += fsrfsbitmap01
-SUBDIRS += fsnofs01
-SUBDIRS += fsimfsgeneric01
-SUBDIRS += fsbdpart01
+_SUBDIRS =
+_SUBDIRS += fsdosfsname01
+_SUBDIRS += fsdosfswrite01
+_SUBDIRS += fsdosfsformat01
+_SUBDIRS += fsfseeko01
+_SUBDIRS += fsdosfssync01
+_SUBDIRS += imfs_fserror
+_SUBDIRS += imfs_fslink
+_SUBDIRS += imfs_fspatheval
+_SUBDIRS += imfs_fspermission
+_SUBDIRS += imfs_fsrdwr
+_SUBDIRS += imfs_fssymlink
+_SUBDIRS += imfs_fstime
+_SUBDIRS += jffs2_fserror
+_SUBDIRS += jffs2_fslink
+_SUBDIRS += jffs2_fspatheval
+_SUBDIRS += jffs2_fspermission
+_SUBDIRS += jffs2_fsrdwr
+_SUBDIRS += jffs2_fssymlink
+_SUBDIRS += jffs2_fstime
+_SUBDIRS += mdosfs_fserror
+_SUBDIRS += mdosfs_fspatheval
+_SUBDIRS += mdosfs_fsrdwr
+_SUBDIRS += mdosfs_fsstatvfs
+_SUBDIRS += mimfs_fserror
+_SUBDIRS += mimfs_fslink
+_SUBDIRS += mimfs_fspatheval
+_SUBDIRS += mimfs_fspermission
+_SUBDIRS += mimfs_fsrdwr
+_SUBDIRS += mimfs_fssymlink
+_SUBDIRS += mimfs_fstime
+_SUBDIRS += mimfs_fsrename
+_SUBDIRS += mrfs_fserror
+_SUBDIRS += mrfs_fslink
+_SUBDIRS += mrfs_fspatheval
+_SUBDIRS += mrfs_fspermission
+_SUBDIRS += mrfs_fsrdwr
+_SUBDIRS += mrfs_fssymlink
+_SUBDIRS += mrfs_fstime
+_SUBDIRS += mrfs_fsfpathconf
+_SUBDIRS += fsrfsbitmap01
+_SUBDIRS += fsnofs01
+_SUBDIRS += fsimfsgeneric01
+_SUBDIRS += fsbdpart01

 EXTRA_DIST =
 EXTRA_DIST += support/ramdisk_support.c
@@ -52,5 +52,5 @@ EXTRA_DIST += support/fstest_support.c
 EXTRA_DIST += support/fstest_support.h
 EXTRA_DIST += support/fstest.h

-include $(top_srcdir)/../automake/subdirs.am
+include $(top_srcdir)/../automake/test-subdirs.am
 include $(top_srcdir)/../automake/local.am
--- a/testsuites/libtests/Makefile.am
+++ b/testsuites/libtests/Makefile.am
@@ -1,21 +1,21 @@
 ACLOCAL_AMFLAGS = -I ../aclocal

-SUBDIRS = POSIX
-SUBDIRS += newlib01
-SUBDIRS += block17
-SUBDIRS += exit02
-SUBDIRS += exit01
-SUBDIRS += utf8proc01
-SUBDIRS += md501
-SUBDIRS += sparsedisk01
-SUBDIRS += block16
-SUBDIRS += block15
-SUBDIRS += block14
-SUBDIRS += block13
-SUBDIRS += rbheap01
-SUBDIRS += flashdisk01
+_SUBDIRS = POSIX
+_SUBDIRS += newlib01
+_SUBDIRS += block17
+_SUBDIRS += exit02
+_SUBDIRS += exit01
+_SUBDIRS += utf8proc01
+_SUBDIRS += md501
+_SUBDIRS += sparsedisk01
+_SUBDIRS += block16
+_SUBDIRS += block15
+_SUBDIRS += block14
+_SUBDIRS += block13
+_SUBDIRS += rbheap01
+_SUBDIRS += flashdisk01

-SUBDIRS += bspcmdline01 cpuuse devfs01 devfs02 devfs03 devfs04 \
+_SUBDIRS += bspcmdline01 cpuuse devfs01 devfs02 devfs03 devfs04 \
    deviceio01 devnullfatal01 dumpbuf01 gxx01 \
    malloctest malloc02 malloc03 malloc04 malloc05 heapwalk \
    putenvtest monitor monitor02 rtmonuse stackchk stackchk01 \
@@ -29,11 +29,11 @@ SUBDIRS += bspcmdline01 cpuuse devfs01 devfs02 devfs03 devfs04 \

 if NETTESTS
 if HAS_POSIX
-SUBDIRS += mghttpd01
+_SUBDIRS += mghttpd01
 endif
-SUBDIRS += ftp01
-SUBDIRS += syscall01
+_SUBDIRS += ftp01
+_SUBDIRS += syscall01
 endif

-include $(top_srcdir)/../automake/subdirs.am
+include $(top_srcdir)/../automake/test-subdirs.am
 include $(top_srcdir)/../automake/local.am
--- a/testsuites/mptests/Makefile.am
+++ b/testsuites/mptests/Makefile.am
@@ -1,7 +1,7 @@
 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
--- a/testsuites/psxtests/Makefile.am
+++ b/testsuites/psxtests/Makefile.am
@@ -1,8 +1,8 @@
 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 psx15 psx16 \
    psxaio01 psxaio02 psxaio03 \
    psxalarm01 psxautoinit01 psxautoinit02 psxbarrier01 \
@@ -18,22 +18,22 @@ SUBDIRS += psxhdrs psx01 psx02 psx03 psx04 psx05 psx06 psx07 psx08 psx09 \
 endif

 ## File IO tests
-SUBDIRS += psxfile01 psxfile02 psxfilelock01 psxgetrusage01 psxid01 \
+_SUBDIRS += psxfile01 psxfile02 psxfilelock01 psxgetrusage01 psxid01 \
    psximfs01 psximfs02 psxreaddir psxstat psxmount psx13 psxchroot01 \
    psxpasswd01 psxpasswd02 psxpipe01 psxtimes01 psxfchx01

 ## POSIX Keys are always available
-SUBDIRS += psxkey01 psxkey02 psxkey03 psxkey04 \
+_SUBDIRS += psxkey01 psxkey02 psxkey03 psxkey04 \
    psxkey05 psxkey06 psxkey08 psxkey09 psxkey10
 ## But some of the tests need other POSIX features
 if HAS_POSIX
-SUBDIRS += psxkey07
+_SUBDIRS += psxkey07
 endif

 ## POSIX Once is always available
-SUBDIRS += psxonce01
+_SUBDIRS += psxonce01

-SUBDIRS += psxrdwrv
+_SUBDIRS += psxrdwrv

-include $(top_srcdir)/../automake/subdirs.am
+include $(top_srcdir)/../automake/test-subdirs.am
 include $(top_srcdir)/../automake/local.am
--- a/testsuites/samples/Makefile.am
+++ b/testsuites/samples/Makefile.am
@@ -1,25 +1,25 @@
 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
--- a/testsuites/sptests/Makefile.am
+++ b/testsuites/sptests/Makefile.am
@@ -2,7 +2,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 \
    sp10 sp11 sp12 sp13 sp14 sp15 sp16 sp17 sp18 sp19 \
    sp20 sp21 sp22 sp23 sp24 sp25 sp26 sp27 sp27a           \
@@ -35,34 +35,34 @@ SUBDIRS = \
    sptask_err04 spclock_err01
 if HAS_SMP
 else
-SUBDIRS += sp29
+_SUBDIRS += sp29
 endif
-SUBDIRS += spscheduler01
-SUBDIRS += spprofiling01
-SUBDIRS += spfatal28
-SUBDIRS += spthreadlife01
-SUBDIRS += spprofiling01
-SUBDIRS += spcache01
-SUBDIRS += sptls03
-SUBDIRS += spcpucounter01
+_SUBDIRS += spscheduler01
+_SUBDIRS += spprofiling01
+_SUBDIRS += spfatal28
+_SUBDIRS += spthreadlife01
+_SUBDIRS += spprofiling01
+_SUBDIRS += spcache01
+_SUBDIRS += sptls03
+_SUBDIRS += spcpucounter01
 if HAS_CPLUSPLUS
-SUBDIRS += sptls02
+_SUBDIRS += sptls02
 endif
-SUBDIRS += sptls01
-SUBDIRS += spintrcritical20
-SUBDIRS += spintrcritical19
-SUBDIRS += spcontext01
-SUBDIRS += spfatal26
-SUBDIRS += speventtransient01
-SUBDIRS += speventsystem01
-SUBDIRS += spinternalerror01
-SUBDIRS += spinternalerror02
-SUBDIRS += sptimer_err01 sptimer_err02
-SUBDIRS += spclock_err02
+_SUBDIRS += sptls01
+_SUBDIRS += spintrcritical20
+_SUBDIRS += spintrcritical19
+_SUBDIRS += spcontext01
+_SUBDIRS += spfatal26
+_SUBDIRS += speventtransient01
+_SUBDIRS += speventsystem01
+_SUBDIRS += spinternalerror01
+_SUBDIRS += spinternalerror02
+_SUBDIRS += sptimer_err01 sptimer_err02
+_SUBDIRS += spclock_err02

 if HAS_CPUSET
-SUBDIRS += spcpuset01
+_SUBDIRS += spcpuset01
 endif

-include $(top_srcdir)/../automake/subdirs.am
+include $(top_srcdir)/../automake/test-subdirs.am
 include $(top_srcdir)/../automake/local.am
--- a/testsuites/tmtests/Makefile.am
+++ b/testsuites/tmtests/Makefile.am
@@ -1,9 +1,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 tm30
-SUBDIRS += tmcontext01
+_SUBDIRS += tmcontext01

-include $(top_srcdir)/../automake/subdirs.am
+include $(top_srcdir)/../automake/test-subdirs.am
 include $(top_srcdir)/../automake/local.am
--- a/tools/build/rtems-test-check
+++ b/tools/build/rtems-test-check
@@ -0,0 +1,52 @@
+#! /bin/sh
+#
+# Copyright 2014 Chris Johns <chrisj@rtems.org>
+# All rights reserved
+#
+
+#
+# usage: rtems-test-check <bsp-test-database> <bsp> <tests..>
+#
+
+if test $# -lt 3; then
+  echo "error: invalid command line" >&2
+  exit 2
+fi
+
+testdata="$1"
+shift
+bsp="$1"
+shift
+tests="$*"
+bsp_tests=${tests}
+
+#
+# If there is no testdata all tests are valid.
+#
+if test -f $testdata; then
+  disabled_tests=""
+  for t in $(cat $testdata | sed -e 's/#.*$//' -e '/^$/d');
+  do
+   disabled_tests="${disabled_tests} ${t}"
+  done
+
+  bsp_tests=""
+  for t in ${tests};
+  do
+    allow="yes"
+    for dt in ${disabled_tests};
+    do
+      if test ${t} = ${dt}; then
+        allow="no"
+      fi
+    done
+    if test ${allow} = yes; then
+      bsp_tests="${bsp_tests} ${t}"
+    fi
+  done
+fi
+
+echo ${bsp_tests}
+
+exit 0
+