[PATCH] testsuite: Add test states to the testsuit configuration files.

Chris Johns chrisj at rtems.org
Mon Dec 5 03:57:58 UTC 2016


Change the testsuite configuration files to hold state information about
a test. The states are:

 exclude        - Do not build the test
 expected-fail  - The test is expected to fail
 indeterminate  - The test may pass or may fail

A message is printed just after the test's BEGIN message to indicate
there is a special state for the test. No state message means the test
is expected to pass.

This support requires tests are correctly written to the use standard
support to begin and end a test.
---
 .../arm/atsam/make/custom/atsamv-testsuite.tcfg    |  42 +++----
 .../lm3s69xx/make/custom/lm3s3749-testsuite.tcfg   |  86 +++++++-------
 .../lm3s69xx/make/custom/lm3s6965-testsuite.tcfg   |  38 +++---
 .../lm3s69xx/make/custom/lm4f120-testsuite.tcfg    |  50 ++++----
 .../make/custom/lpc1768_mbed-testsuite.tcfg        |  36 +++---
 .../custom/lpc1768_mbed_ahb_ram-testsuite.tcfg     |  38 +++---
 .../custom/lpc1768_mbed_ahb_ram_eth-testsuite.tcfg |  60 +++++-----
 .../make/custom/lpc17xx_ea_rom_int-testsuite.tcfg  |   2 +-
 .../custom/lpc17xx_plx800_rom_int-testsuite.tcfg   |   2 +-
 .../arm/lpc24xx/make/custom/lpc2362-testsuite.tcfg |  90 +++++++--------
 .../make/custom/lpc23xx_tli800-testsuite.tcfg      | 112 +++++++++---------
 .../make/custom/lpc24xx_ncs_rom_int-testsuite.tcfg |   2 +-
 .../custom/lpc24xx_plx800_rom_int-testsuite.tcfg   |   2 +-
 .../make/custom/lpc40xx_ea_rom_int-testsuite.tcfg  |   2 +-
 .../make/custom/lpc32xx_mzx_stage_1-testsuite.tcfg |  34 +++---
 .../arm/rtl22xx/make/custom/rtl22xx-testsuite.tcfg |  10 +-
 .../rtl22xx/make/custom/rtl22xx_t-testsuite.tcfg   |   2 +-
 .../stm32f4/make/custom/stm32f105rc-testsuite.tcfg |  38 +++---
 .../arm/stm32f4/make/custom/stm32f4-testsuite.tcfg |  18 +--
 .../custom/tms570ls3137_hdk_intram-testsuite.tcfg  |  36 +++---
 .../m32cbsp/make/custom/m32csim-testsuite.tcfg     |  26 ++---
 .../make/custom/mcf5206elite-testsuite.tcfg        |   4 +-
 .../mcf52235/make/custom/mcf52235-testsuite.tcfg   |  50 ++++----
 .../mcf5225x/make/custom/mcf5225x-testsuite.tcfg   |  26 ++---
 .../m68k/mrm332/make/custom/mrm332-testsuite.tcfg  |  14 +--
 .../mvme162/make/custom/mvme162-testsuite.tcfg     |   2 +-
 .../mvme162/make/custom/mvme162lx-testsuite.tcfg   |   2 +-
 .../hurricane/make/custom/hurricane-testsuite.tcfg |   2 +-
 .../jmr3904/make/custom/jmr3904-testsuite.tcfg     |   2 +-
 .../rbtx4925/make/custom/rbtx4925-testsuite.tcfg   |   2 +-
 .../rbtx4938/make/custom/rbtx4938-testsuite.tcfg   |   2 +-
 .../make/custom/generic_or1k-testsuite.tcfg        |   2 +-
 .../mpc55xxevb/make/custom/gwlcfm-testsuite.tcfg   |  18 +--
 .../make/custom/mpc5566evb-testsuite.tcfg          |  18 +--
 .../make/custom/mpc5566evb_spe-testsuite.tcfg      |  18 +--
 .../make/custom/mpc5643l_dpu-testsuite.tcfg        |  22 ++--
 .../make/custom/mpc5643l_evb-testsuite.tcfg        |  22 ++--
 .../mpc55xxevb/make/custom/mpc5668g-testsuite.tcfg |   2 +-
 .../make/custom/mpc5674f_ecu508_app-testsuite.tcfg |   2 +-
 .../custom/mpc5674f_ecu508_boot-testsuite.tcfg     |   2 +-
 .../make/custom/mpc5674f_rsm6-testsuite.tcfg       |   2 +-
 .../make/custom/mpc5674fevb-testsuite.tcfg         |   2 +-
 .../make/custom/mpc5674fevb_spe-testsuite.tcfg     |   2 +-
 .../make/custom/phycore_mpc5554-testsuite.tcfg     |  18 +--
 .../qoriq/make/custom/qoriq_core_0-testsuite.tcfg  |   2 +-
 .../qoriq/make/custom/qoriq_core_1-testsuite.tcfg  |   2 +-
 .../make/custom/qoriq_p1020rdb-testsuite.tcfg      |   2 +-
 .../make/custom/qoriq_t2080rdb-testsuite.tcfg      |   2 +-
 .../make/custom/qoriq_t4240rdb-testsuite.tcfg      |   2 +-
 .../sh/gensh1/make/custom/gensh1-testsuite.tcfg    |   8 +-
 .../sh/gensh2/make/custom/gensh2-testsuite.tcfg    |   8 +-
 .../sh/shsim/make/custom/simsh1-testsuite.tcfg     |   8 +-
 .../sh/shsim/make/custom/simsh2-testsuite.tcfg     |   8 +-
 .../sh/shsim/make/custom/simsh2e-testsuite.tcfg    |   8 +-
 .../sh/shsim/make/custom/simsh4-testsuite.tcfg     |   8 +-
 .../sparc/erc32/make/custom/erc32-testsuite.tcfg   |   4 +
 testsuites/automake/compile.am                     |   2 +-
 testsuites/automake/test-subdirs.am                |  11 +-
 testsuites/support/include/buffer_test_io.h        |  32 +++++-
 .../testdata/disable-intrcritical-tests.tcfg       |  46 ++++----
 testsuites/testdata/disable-jffs2-tests.tcfg       |  16 +--
 testsuites/testdata/disable-mrfs-tests.tcfg        |  18 +--
 .../testdata/dltests-broken-on-this-bsp.tcfg       |  10 +-
 testsuites/testdata/require-tick-isr.tcfg          | 112 +++++++++---------
 tools/build/rtems-test-check                       | 128 ++++++++++++++++-----
 65 files changed, 755 insertions(+), 644 deletions(-)
 create mode 100644 c/src/lib/libbsp/sparc/erc32/make/custom/erc32-testsuite.tcfg

diff --git a/c/src/lib/libbsp/arm/atsam/make/custom/atsamv-testsuite.tcfg b/c/src/lib/libbsp/arm/atsam/make/custom/atsamv-testsuite.tcfg
index 62c9a53..b209cd3 100644
--- a/c/src/lib/libbsp/arm/atsam/make/custom/atsamv-testsuite.tcfg
+++ b/c/src/lib/libbsp/arm/atsam/make/custom/atsamv-testsuite.tcfg
@@ -2,24 +2,24 @@
 # The ATSAMV BSP has too little memory for some tests.
 #
 
-fileio
-flashdisk01
-fsdosfsname01
-ftp01
-jffs2_fserror
-jffs2_fslink
-jffs2_fspatheval
-jffs2_fspermission
-jffs2_fsrdwr
-jffs2_fsscandir01
-jffs2_fssymlink
-jffs2_fstime
-mghttpd01
-pppd
-psxconfig01
-sp16
-sp25
-sp48
-spregion_err01
-spstkalloc02
-tmfine01
+exclude: fileio
+exclude: flashdisk01
+exclude: fsdosfsname01
+exclude: ftp01
+exclude: jffs2_fserror
+exclude: jffs2_fslink
+exclude: jffs2_fspatheval
+exclude: jffs2_fspermission
+exclude: jffs2_fsrdwr
+exclude: jffs2_fsscandir01
+exclude: jffs2_fssymlink
+exclude: jffs2_fstime
+exclude: mghttpd01
+exclude: pppd
+exclude: psxconfig01
+exclude: sp16
+exclude: sp25
+exclude: sp48
+exclude: spregion_err01
+exclude: spstkalloc02
+exclude: tmfine01
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/make/custom/lm3s3749-testsuite.tcfg b/c/src/lib/libbsp/arm/lm3s69xx/make/custom/lm3s3749-testsuite.tcfg
index 7e4b504..1806a08 100644
--- a/c/src/lib/libbsp/arm/lm3s69xx/make/custom/lm3s3749-testsuite.tcfg
+++ b/c/src/lib/libbsp/arm/lm3s69xx/make/custom/lm3s3749-testsuite.tcfg
@@ -4,46 +4,46 @@
 # Format is one line per test that is _NOT_ built.
 #
 
-capture
-cdtest
-iostream
-dl01
-dl02
-dl04
-dl05
-ftp01
-fileio
-flashdisk01
-fsdosfsname01
-fsdosfsformat01
-fsrfsbitmap01
-jffs2_fserror
-jffs2_fslink
-jffs2_fspatheval
-jffs2_fspermission
-jffs2_fsrdwr
-jffs2_fsscandir01
-jffs2_fssymlink
-jffs2_fstime
-loopback
-mghttpd01
-mdosfs_fserror
-mdosfs_fsrdwr
-monitor02
-mrfs_fserror
-mrfs_fsfpathconf
-mrfs_fslink
-mrfs_fspatheval
-mrfs_fspermission
-mrfs_fsrdwr
-mrfs_fsscandir01
-mrfs_fssymlink
-mrfs_fstime
-paranoia
-pppd
-rtems++
-shell01
-spstkalloc02
-sptls02
-syscall01
-utf8proc01
+exclude: capture
+exclude: cdtest
+exclude: iostream
+exclude: dl01
+exclude: dl02
+exclude: dl04
+exclude: dl05
+exclude: ftp01
+exclude: fileio
+exclude: flashdisk01
+exclude: fsdosfsname01
+exclude: fsdosfsformat01
+exclude: fsrfsbitmap01
+exclude: jffs2_fserror
+exclude: jffs2_fslink
+exclude: jffs2_fspatheval
+exclude: jffs2_fspermission
+exclude: jffs2_fsrdwr
+exclude: jffs2_fsscandir01
+exclude: jffs2_fssymlink
+exclude: jffs2_fstime
+exclude: loopback
+exclude: mghttpd01
+exclude: mdosfs_fserror
+exclude: mdosfs_fsrdwr
+exclude: monitor02
+exclude: mrfs_fserror
+exclude: mrfs_fsfpathconf
+exclude: mrfs_fslink
+exclude: mrfs_fspatheval
+exclude: mrfs_fspermission
+exclude: mrfs_fsrdwr
+exclude: mrfs_fsscandir01
+exclude: mrfs_fssymlink
+exclude: mrfs_fstime
+exclude: paranoia
+exclude: pppd
+exclude: rtems++
+exclude: shell01
+exclude: spstkalloc02
+exclude: sptls02
+exclude: syscall01
+exclude: utf8proc01
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/make/custom/lm3s6965-testsuite.tcfg b/c/src/lib/libbsp/arm/lm3s69xx/make/custom/lm3s6965-testsuite.tcfg
index 0fca79c..654fa10 100644
--- a/c/src/lib/libbsp/arm/lm3s69xx/make/custom/lm3s6965-testsuite.tcfg
+++ b/c/src/lib/libbsp/arm/lm3s69xx/make/custom/lm3s6965-testsuite.tcfg
@@ -4,22 +4,22 @@
 # Format is one line per test that is _NOT_ built.
 #
 
-fileio
-iostream
-flashdisk01
-fsdosfsname01
-ftp01
-jffs2_fserror
-jffs2_fslink
-jffs2_fspatheval
-jffs2_fspermission
-jffs2_fsrdwr
-jffs2_fsscandir01
-jffs2_fssymlink
-jffs2_fstime
-mghttpd01
-monitor02
-utf8proc01
-pppd
-rtems++
-spstkalloc02
+exclude: fileio
+exclude: iostream
+exclude: flashdisk01
+exclude: fsdosfsname01
+exclude: ftp01
+exclude: jffs2_fserror
+exclude: jffs2_fslink
+exclude: jffs2_fspatheval
+exclude: jffs2_fspermission
+exclude: jffs2_fsrdwr
+exclude: jffs2_fsscandir01
+exclude: jffs2_fssymlink
+exclude: jffs2_fstime
+exclude: mghttpd01
+exclude: monitor02
+exclude: utf8proc01
+exclude: pppd
+exclude: rtems++
+exclude: spstkalloc02
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/make/custom/lm4f120-testsuite.tcfg b/c/src/lib/libbsp/arm/lm3s69xx/make/custom/lm4f120-testsuite.tcfg
index a8617ca..01cb8d9 100644
--- a/c/src/lib/libbsp/arm/lm3s69xx/make/custom/lm4f120-testsuite.tcfg
+++ b/c/src/lib/libbsp/arm/lm3s69xx/make/custom/lm4f120-testsuite.tcfg
@@ -4,28 +4,28 @@
 # Format is one line per test that is _NOT_ built.
 #
 
-fileio
-cdtest
-iostream
-flashdisk01
-fsdosfsname01
-ftp01
-jffs2_fserror
-jffs2_fslink
-jffs2_fspatheval
-jffs2_fspermission
-jffs2_fsrdwr
-jffs2_fsscandir01
-jffs2_fssymlink
-jffs2_fstime
-mghttpd01
-monitor02
-pppd
-sp16
-sp25
-sp48
-spstkalloc02
-sptls02
-rtems++
-tmfine01
-utf8proc01
+exclude: fileio
+exclude: cdtest
+exclude: iostream
+exclude: flashdisk01
+exclude: fsdosfsname01
+exclude: ftp01
+exclude: jffs2_fserror
+exclude: jffs2_fslink
+exclude: jffs2_fspatheval
+exclude: jffs2_fspermission
+exclude: jffs2_fsrdwr
+exclude: jffs2_fsscandir01
+exclude: jffs2_fssymlink
+exclude: jffs2_fstime
+exclude: mghttpd01
+exclude: monitor02
+exclude: pppd
+exclude: sp16
+exclude: sp25
+exclude: sp48
+exclude: spstkalloc02
+exclude: sptls02
+exclude: rtems++
+exclude: tmfine01
+exclude: utf8proc01
diff --git a/c/src/lib/libbsp/arm/lpc176x/make/custom/lpc1768_mbed-testsuite.tcfg b/c/src/lib/libbsp/arm/lpc176x/make/custom/lpc1768_mbed-testsuite.tcfg
index 8240f55..05701f9 100644
--- a/c/src/lib/libbsp/arm/lpc176x/make/custom/lpc1768_mbed-testsuite.tcfg
+++ b/c/src/lib/libbsp/arm/lpc176x/make/custom/lpc1768_mbed-testsuite.tcfg
@@ -4,21 +4,21 @@
 # Format is one line per test that is _NOT_ built.
 #
 
-flashdisk01
-ftp01
-utf8proc01
-spstkalloc02
-fsdosfsname01
-jffs2_fserror
-jffs2_fslink
-jffs2_fspatheval
-jffs2_fspermission
-jffs2_fsrdwr
-jffs2_fsscandir01
-jffs2_fssymlink
-jffs2_fstime
-pppd
-mghttpd01
-tmfine01
-iostream
-rtems++
+exclude: flashdisk01
+exclude: ftp01
+exclude: utf8proc01
+exclude: spstkalloc02
+exclude: fsdosfsname01
+exclude: jffs2_fserror
+exclude: jffs2_fslink
+exclude: jffs2_fspatheval
+exclude: jffs2_fspermission
+exclude: jffs2_fsrdwr
+exclude: jffs2_fsscandir01
+exclude: jffs2_fssymlink
+exclude: jffs2_fstime
+exclude: pppd
+exclude: mghttpd01
+exclude: tmfine01
+exclude: iostream
+exclude: rtems++
diff --git a/c/src/lib/libbsp/arm/lpc176x/make/custom/lpc1768_mbed_ahb_ram-testsuite.tcfg b/c/src/lib/libbsp/arm/lpc176x/make/custom/lpc1768_mbed_ahb_ram-testsuite.tcfg
index c4eaea6..e2e1d21 100644
--- a/c/src/lib/libbsp/arm/lpc176x/make/custom/lpc1768_mbed_ahb_ram-testsuite.tcfg
+++ b/c/src/lib/libbsp/arm/lpc176x/make/custom/lpc1768_mbed_ahb_ram-testsuite.tcfg
@@ -4,22 +4,22 @@
 # Format is one line per test that is _NOT_ built.
 #
 
-flashdisk01
-fsdosfsname01
-ftp01
-jffs2_fserror
-jffs2_fslink
-jffs2_fspatheval
-jffs2_fspermission
-jffs2_fsrdwr
-jffs2_fsscandir01
-jffs2_fssymlink
-jffs2_fstime
-mghttpd01
-pppd
-spstkalloc02
-sptls02
-tmfine01
-utf8proc01
-iostream
-rtems++
+exclude: flashdisk01
+exclude: fsdosfsname01
+exclude: ftp01
+exclude: jffs2_fserror
+exclude: jffs2_fslink
+exclude: jffs2_fspatheval
+exclude: jffs2_fspermission
+exclude: jffs2_fsrdwr
+exclude: jffs2_fsscandir01
+exclude: jffs2_fssymlink
+exclude: jffs2_fstime
+exclude: mghttpd01
+exclude: pppd
+exclude: spstkalloc02
+exclude: sptls02
+exclude: tmfine01
+exclude: utf8proc01
+exclude: iostream
+exclude: rtems++
diff --git a/c/src/lib/libbsp/arm/lpc176x/make/custom/lpc1768_mbed_ahb_ram_eth-testsuite.tcfg b/c/src/lib/libbsp/arm/lpc176x/make/custom/lpc1768_mbed_ahb_ram_eth-testsuite.tcfg
index fb7a6d8..5c6e6a4 100644
--- a/c/src/lib/libbsp/arm/lpc176x/make/custom/lpc1768_mbed_ahb_ram_eth-testsuite.tcfg
+++ b/c/src/lib/libbsp/arm/lpc176x/make/custom/lpc1768_mbed_ahb_ram_eth-testsuite.tcfg
@@ -4,33 +4,33 @@
 # Format is one line per test that is _NOT_ built.
 #
 
-fileio
-ftp01
-cdtest
-flashdisk01
-fsdosfsname01
-jffs2_fserror
-jffs2_fslink
-jffs2_fspatheval
-jffs2_fspermission
-jffs2_fsrdwr
-jffs2_fsscandir01
-jffs2_fssymlink
-jffs2_fstime
-mghttpd01
-monitor01
-monitor02
-pppd
-psxconfig01
-rbheap01
-sp16
-sp25
-sp48
-spregion_err01
-spstkalloc
-spstkalloc02
-sptls02
-tmfine01
-utf8proc01
-iostream
-rtems++
+exclude: fileio
+exclude: ftp01
+exclude: cdtest
+exclude: flashdisk01
+exclude: fsdosfsname01
+exclude: jffs2_fserror
+exclude: jffs2_fslink
+exclude: jffs2_fspatheval
+exclude: jffs2_fspermission
+exclude: jffs2_fsrdwr
+exclude: jffs2_fsscandir01
+exclude: jffs2_fssymlink
+exclude: jffs2_fstime
+exclude: mghttpd01
+exclude: monitor01
+exclude: monitor02
+exclude: pppd
+exclude: psxconfig01
+exclude: rbheap01
+exclude: sp16
+exclude: sp25
+exclude: sp48
+exclude: spregion_err01
+exclude: spstkalloc
+exclude: spstkalloc02
+exclude: sptls02
+exclude: tmfine01
+exclude: utf8proc01
+exclude: iostream
+exclude: rtems++
diff --git 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
index d62cd73..9af058d 100644
--- 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
@@ -4,4 +4,4 @@
 # Format is one line per test that is _NOT_ built.
 #
 
-fsdosfsname01
+exclude: fsdosfsname01
diff --git 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
index 51e8009..b5782e4 100644
--- 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
@@ -4,4 +4,4 @@
 # Format is one line per test that is _NOT_ built.
 #
 
-fsdosfsname01
+exclude: fsdosfsname01
diff --git a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc2362-testsuite.tcfg b/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc2362-testsuite.tcfg
index 88dedf3..7038fca 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc2362-testsuite.tcfg
+++ b/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc2362-testsuite.tcfg
@@ -4,48 +4,48 @@
 # Format is one line per test that is _NOT_ built.
 #
 
-capture
-cdtest
-dl01
-dl02
-dl04
-dl05
-fileio
-flashdisk01
-fsdosfsname01
-fsdosfsformat01
-fsrfsbitmap01
-ftp01
-iostream
-jffs2_fserror
-jffs2_fslink
-jffs2_fspatheval
-jffs2_fspermission
-jffs2_fsrdwr
-jffs2_fsscandir01
-jffs2_fssymlink
-jffs2_fstime
-loopback
-math
-mdosfs_fserror
-mghttpd01
-monitor02
-mrfs_fserror
-mrfs_fsfpathconf
-mrfs_fslink
-mrfs_fspatheval
-mrfs_fspermission
-mrfs_fsrdwr
-mrfs_fsscandir01
-mrfs_fssymlink
-mrfs_fstime
-mdosfs_fsrdwr
-paranoia
-pppd
-rtems++
-shell01
-spstkalloc02
-sptls02
-syscall01
-tmfine01
-utf8proc01
+exclude: capture
+exclude: cdtest
+exclude: dl01
+exclude: dl02
+exclude: dl04
+exclude: dl05
+exclude: fileio
+exclude: flashdisk01
+exclude: fsdosfsname01
+exclude: fsdosfsformat01
+exclude: fsrfsbitmap01
+exclude: ftp01
+exclude: iostream
+exclude: jffs2_fserror
+exclude: jffs2_fslink
+exclude: jffs2_fspatheval
+exclude: jffs2_fspermission
+exclude: jffs2_fsrdwr
+exclude: jffs2_fsscandir01
+exclude: jffs2_fssymlink
+exclude: jffs2_fstime
+exclude: loopback
+exclude: math
+exclude: mdosfs_fserror
+exclude: mghttpd01
+exclude: monitor02
+exclude: mrfs_fserror
+exclude: mrfs_fsfpathconf
+exclude: mrfs_fslink
+exclude: mrfs_fspatheval
+exclude: mrfs_fspermission
+exclude: mrfs_fsrdwr
+exclude: mrfs_fsscandir01
+exclude: mrfs_fssymlink
+exclude: mrfs_fstime
+exclude: mdosfs_fsrdwr
+exclude: paranoia
+exclude: pppd
+exclude: rtems++
+exclude: shell01
+exclude: spstkalloc02
+exclude: sptls02
+exclude: syscall01
+exclude: tmfine01
+exclude: utf8proc01
diff --git 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
index b046aad..d3e2972 100644
--- 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
@@ -4,59 +4,59 @@
 # Format is one line per test that is _NOT_ built.
 #
 
-capture
-cdtest
-complex
-crypt01
-dl01
-dl02
-dl04
-dl05
-fileio
-flashdisk01
-fsdosfsformat01
-fsdosfsname01
-fsdosfswrite01
-fsrfsbitmap01
-ftp01
-iostream
-jffs2_fserror
-jffs2_fslink
-jffs2_fspatheval
-jffs2_fspermission
-jffs2_fsrdwr
-jffs2_fsscandir01
-jffs2_fssymlink
-jffs2_fstime
-loopback
-math
-mathf
-mdosfs_fserror
-mdosfs_fsscandir01
-mghttpd01
-monitor
-monitor02
-mrfs_fserror
-mrfs_fsfpathconf
-mrfs_fslink
-mrfs_fspatheval
-mrfs_fspermission
-mrfs_fsrdwr
-mrfs_fsscandir01
-mrfs_fssymlink
-mrfs_fstime
-mdosfs_fsrdwr
-mdosfs_fspatheval
-mdosfs_fstime
-paranoia
-pppd
-psxmsgq01
-rtems++
-shell01
-sptls02
-spstkalloc02
-syscall01
-tar01
-termios
-tmfine01
-utf8proc01
+exclude: capture
+exclude: cdtest
+exclude: complex
+exclude: crypt01
+exclude: dl01
+exclude: dl02
+exclude: dl04
+exclude: dl05
+exclude: fileio
+exclude: flashdisk01
+exclude: fsdosfsformat01
+exclude: fsdosfsname01
+exclude: fsdosfswrite01
+exclude: fsrfsbitmap01
+exclude: ftp01
+exclude: iostream
+exclude: jffs2_fserror
+exclude: jffs2_fslink
+exclude: jffs2_fspatheval
+exclude: jffs2_fspermission
+exclude: jffs2_fsrdwr
+exclude: jffs2_fsscandir01
+exclude: jffs2_fssymlink
+exclude: jffs2_fstime
+exclude: loopback
+exclude: math
+exclude: mathf
+exclude: mdosfs_fserror
+exclude: mdosfs_fsscandir01
+exclude: mghttpd01
+exclude: monitor
+exclude: monitor02
+exclude: mrfs_fserror
+exclude: mrfs_fsfpathconf
+exclude: mrfs_fslink
+exclude: mrfs_fspatheval
+exclude: mrfs_fspermission
+exclude: mrfs_fsrdwr
+exclude: mrfs_fsscandir01
+exclude: mrfs_fssymlink
+exclude: mrfs_fstime
+exclude: mdosfs_fsrdwr
+exclude: mdosfs_fspatheval
+exclude: mdosfs_fstime
+exclude: paranoia
+exclude: pppd
+exclude: psxmsgq01
+exclude: rtems++
+exclude: shell01
+exclude: sptls02
+exclude: spstkalloc02
+exclude: syscall01
+exclude: tar01
+exclude: termios
+exclude: tmfine01
+exclude: utf8proc01
diff --git 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
index 29887c9..94d3dd4 100644
--- 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
@@ -4,4 +4,4 @@
 # Format is one line per test that is _NOT_ built.
 #
 
-fsdosfsname01
+exclude: fsdosfsname01
diff --git 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
index 8b465d3..8759140 100644
--- 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
@@ -4,4 +4,4 @@
 # Format is one line per test that is _NOT_ built.
 #
 
-fsdosfsname01
+exclude: fsdosfsname01
diff --git a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc40xx_ea_rom_int-testsuite.tcfg b/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc40xx_ea_rom_int-testsuite.tcfg
index b8b9bbe..3849651 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc40xx_ea_rom_int-testsuite.tcfg
+++ b/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc40xx_ea_rom_int-testsuite.tcfg
@@ -4,4 +4,4 @@
 # Format is one line per test that is _NOT_ built.
 #
 
-fsdosfsname01
+exclude: fsdosfsname01
diff --git 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
index cd40568..e61f406 100644
--- 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
@@ -4,20 +4,20 @@
 # Format is one line per test that is _NOT_ built.
 #
 
-fileio
-ftp01
-fsdosfsname01
-iostream
-jffs2_fserror
-jffs2_fslink
-jffs2_fspatheval
-jffs2_fspermission
-jffs2_fsrdwr
-jffs2_fsscandir01
-jffs2_fssymlink
-jffs2_fstime
-mghttpd01
-monitor02
-pppd
-rtems++
-utf8proc01
+exclude: fileio
+exclude: ftp01
+exclude: fsdosfsname01
+exclude: iostream
+exclude: jffs2_fserror
+exclude: jffs2_fslink
+exclude: jffs2_fspatheval
+exclude: jffs2_fspermission
+exclude: jffs2_fsrdwr
+exclude: jffs2_fsscandir01
+exclude: jffs2_fssymlink
+exclude: jffs2_fstime
+exclude: mghttpd01
+exclude: monitor02
+exclude: pppd
+exclude: rtems++
+exclude: utf8proc01
diff --git a/c/src/lib/libbsp/arm/rtl22xx/make/custom/rtl22xx-testsuite.tcfg b/c/src/lib/libbsp/arm/rtl22xx/make/custom/rtl22xx-testsuite.tcfg
index 29a1cc9..791f608 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/make/custom/rtl22xx-testsuite.tcfg
+++ b/c/src/lib/libbsp/arm/rtl22xx/make/custom/rtl22xx-testsuite.tcfg
@@ -4,8 +4,8 @@
 # Format is one line per test that is _NOT_ built.
 #
 
-fileio
-fsdosfsname01
-iostream
-rtems++
-utf8proc01
+exclude: fileio
+exclude: fsdosfsname01
+exclude: iostream
+exclude: rtems++
+exclude: utf8proc01
diff --git 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
index 764b0c2..cca0e62 100644
--- 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
@@ -4,4 +4,4 @@
 # Format is one line per test that is _NOT_ built.
 #
 
-fsdosfsname01
+exclude: fsdosfsname01
diff --git a/c/src/lib/libbsp/arm/stm32f4/make/custom/stm32f105rc-testsuite.tcfg b/c/src/lib/libbsp/arm/stm32f4/make/custom/stm32f105rc-testsuite.tcfg
index d277e8a..9889f84 100644
--- a/c/src/lib/libbsp/arm/stm32f4/make/custom/stm32f105rc-testsuite.tcfg
+++ b/c/src/lib/libbsp/arm/stm32f4/make/custom/stm32f105rc-testsuite.tcfg
@@ -4,22 +4,22 @@
 # Format is one line per test that is _NOT_ built.
 #
 
-fileio
-flashdisk01
-fsdosfsname01
-ftp01
-iostream
-jffs2_fserror
-jffs2_fslink
-jffs2_fspatheval
-jffs2_fspermission
-jffs2_fsrdwr
-jffs2_fsscandir01
-jffs2_fssymlink
-jffs2_fstime
-mghttpd01
-monitor02
-pppd
-rtems++
-spstkalloc02
-utf8proc01
+exclude: fileio
+exclude: flashdisk01
+exclude: fsdosfsname01
+exclude: ftp01
+exclude: iostream
+exclude: jffs2_fserror
+exclude: jffs2_fslink
+exclude: jffs2_fspatheval
+exclude: jffs2_fspermission
+exclude: jffs2_fsrdwr
+exclude: jffs2_fsscandir01
+exclude: jffs2_fssymlink
+exclude: jffs2_fstime
+exclude: mghttpd01
+exclude: monitor02
+exclude: pppd
+exclude: rtems++
+exclude: spstkalloc02
+exclude: utf8proc01
diff --git a/c/src/lib/libbsp/arm/stm32f4/make/custom/stm32f4-testsuite.tcfg b/c/src/lib/libbsp/arm/stm32f4/make/custom/stm32f4-testsuite.tcfg
index d0f7da8..31bae14 100644
--- a/c/src/lib/libbsp/arm/stm32f4/make/custom/stm32f4-testsuite.tcfg
+++ b/c/src/lib/libbsp/arm/stm32f4/make/custom/stm32f4-testsuite.tcfg
@@ -4,12 +4,12 @@
 # Format is one line per test that is _NOT_ built.
 #
 
-fsdosfsname01
-jffs2_fserror
-jffs2_fslink
-jffs2_fspatheval
-jffs2_fspermission
-jffs2_fsrdwr
-jffs2_fsscandir01
-jffs2_fssymlink
-jffs2_fstime
+exclude: fsdosfsname01
+exclude: jffs2_fserror
+exclude: jffs2_fslink
+exclude: jffs2_fspatheval
+exclude: jffs2_fspermission
+exclude: jffs2_fsrdwr
+exclude: jffs2_fsscandir01
+exclude: jffs2_fssymlink
+exclude: jffs2_fstime
diff --git a/c/src/lib/libbsp/arm/tms570/make/custom/tms570ls3137_hdk_intram-testsuite.tcfg b/c/src/lib/libbsp/arm/tms570/make/custom/tms570ls3137_hdk_intram-testsuite.tcfg
index bb72c04..38c6578 100644
--- a/c/src/lib/libbsp/arm/tms570/make/custom/tms570ls3137_hdk_intram-testsuite.tcfg
+++ b/c/src/lib/libbsp/arm/tms570/make/custom/tms570ls3137_hdk_intram-testsuite.tcfg
@@ -4,21 +4,21 @@
 # Format is one line per test that is _NOT_ built.
 #
 
-fileio
-iostream
-pppd
-loopback
-syscall01
-utf8proc01
-monitor02
-mghttpd01
-ftp01
-fsdosfsname01
-jffs2_fserror
-jffs2_fslink
-jffs2_fspatheval
-jffs2_fspermission
-jffs2_fsrdwr
-jffs2_fsscandir01
-jffs2_fssymlink
-jffs2_fstime
+exclude: fileio
+exclude: iostream
+exclude: pppd
+exclude: loopback
+exclude: syscall01
+exclude: utf8proc01
+exclude: monitor02
+exclude: mghttpd01
+exclude: ftp01
+exclude: fsdosfsname01
+exclude: jffs2_fserror
+exclude: jffs2_fslink
+exclude: jffs2_fspatheval
+exclude: jffs2_fspermission
+exclude: jffs2_fsrdwr
+exclude: jffs2_fsscandir01
+exclude: jffs2_fssymlink
+exclude: jffs2_fstime
diff --git a/c/src/lib/libbsp/m32c/m32cbsp/make/custom/m32csim-testsuite.tcfg b/c/src/lib/libbsp/m32c/m32cbsp/make/custom/m32csim-testsuite.tcfg
index c522616..618806b 100644
--- a/c/src/lib/libbsp/m32c/m32cbsp/make/custom/m32csim-testsuite.tcfg
+++ b/c/src/lib/libbsp/m32c/m32cbsp/make/custom/m32csim-testsuite.tcfg
@@ -6,16 +6,16 @@ include: testdata/require-tick-isr.tcfg
 include: testdata/disable-jffs2-tests.tcfg
 include: testdata/disable-mrfs-tests.tcfg
 
-crypt01
-fileio
-flashdisk01
-fsbdpart01
-fsdosfsformat01
-fsdosfswrite01
-fsdosfsname01
-fsrfsbitmap01
-sha
-spstkalloc02
-sptls01
-tmcontext01
-utf8proc01
+exclude: crypt01
+exclude: fileio
+exclude: flashdisk01
+exclude: fsbdpart01
+exclude: fsdosfsformat01
+exclude: fsdosfswrite01
+exclude: fsdosfsname01
+exclude: fsrfsbitmap01
+exclude: sha
+exclude: spstkalloc02
+exclude: sptls01
+exclude: tmcontext01
+exclude: utf8proc01
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/make/custom/mcf5206elite-testsuite.tcfg b/c/src/lib/libbsp/m68k/mcf5206elite/make/custom/mcf5206elite-testsuite.tcfg
index c904280..d11a487 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/make/custom/mcf5206elite-testsuite.tcfg
+++ b/c/src/lib/libbsp/m68k/mcf5206elite/make/custom/mcf5206elite-testsuite.tcfg
@@ -4,5 +4,5 @@
 # Format is one line per test that is _NOT_ built.
 #
 
-fsdosfsname01
-dl05
+exclude: fsdosfsname01
+exclude: dl05
diff --git a/c/src/lib/libbsp/m68k/mcf52235/make/custom/mcf52235-testsuite.tcfg b/c/src/lib/libbsp/m68k/mcf52235/make/custom/mcf52235-testsuite.tcfg
index 9b3841b..b806080 100644
--- a/c/src/lib/libbsp/m68k/mcf52235/make/custom/mcf52235-testsuite.tcfg
+++ b/c/src/lib/libbsp/m68k/mcf52235/make/custom/mcf52235-testsuite.tcfg
@@ -4,28 +4,28 @@
 # Format is one line per test that is _NOT_ built.
 #
 
-capture
-dl05
-fileio
-flashdisk01
-fsdosfsformat01
-fsdosfsname01
-ftp01
-iostream
-jffs2_fserror
-jffs2_fslink
-jffs2_fspatheval
-jffs2_fspermission
-jffs2_fsrdwr
-jffs2_fsscandir01
-jffs2_fssymlink
-jffs2_fstime
-loopback
-mghttpd01
-monitor02
-paranoia
-pppd
-spstkalloc02
-syscall01
-tmfine01
-utf8proc01
+exclude: capture
+exclude: dl05
+exclude: fileio
+exclude: flashdisk01
+exclude: fsdosfsformat01
+exclude: fsdosfsname01
+exclude: ftp01
+exclude: iostream
+exclude: jffs2_fserror
+exclude: jffs2_fslink
+exclude: jffs2_fspatheval
+exclude: jffs2_fspermission
+exclude: jffs2_fsrdwr
+exclude: jffs2_fsscandir01
+exclude: jffs2_fssymlink
+exclude: jffs2_fstime
+exclude: loopback
+exclude: mghttpd01
+exclude: monitor02
+exclude: paranoia
+exclude: pppd
+exclude: spstkalloc02
+exclude: syscall01
+exclude: tmfine01
+exclude: utf8proc01
diff --git a/c/src/lib/libbsp/m68k/mcf5225x/make/custom/mcf5225x-testsuite.tcfg b/c/src/lib/libbsp/m68k/mcf5225x/make/custom/mcf5225x-testsuite.tcfg
index 1fd3b6a..38dfab8 100644
--- a/c/src/lib/libbsp/m68k/mcf5225x/make/custom/mcf5225x-testsuite.tcfg
+++ b/c/src/lib/libbsp/m68k/mcf5225x/make/custom/mcf5225x-testsuite.tcfg
@@ -4,16 +4,16 @@
 # Format is one line per test that is _NOT_ built.
 #
 
-dl05
-fileio
-flashdisk01
-fsdosfsname01
-iostream
-jffs2_fserror
-jffs2_fslink
-jffs2_fspatheval
-jffs2_fspermission
-jffs2_fsrdwr
-jffs2_fsscandir01
-jffs2_fssymlink
-jffs2_fstime
+exclude: dl05
+exclude: fileio
+exclude: flashdisk01
+exclude: fsdosfsname01
+exclude: iostream
+exclude: jffs2_fserror
+exclude: jffs2_fslink
+exclude: jffs2_fspatheval
+exclude: jffs2_fspermission
+exclude: jffs2_fsrdwr
+exclude: jffs2_fsscandir01
+exclude: jffs2_fssymlink
+exclude: jffs2_fstime
diff --git a/c/src/lib/libbsp/m68k/mrm332/make/custom/mrm332-testsuite.tcfg b/c/src/lib/libbsp/m68k/mrm332/make/custom/mrm332-testsuite.tcfg
index 6cfd8a8..b853319 100644
--- a/c/src/lib/libbsp/m68k/mrm332/make/custom/mrm332-testsuite.tcfg
+++ b/c/src/lib/libbsp/m68k/mrm332/make/custom/mrm332-testsuite.tcfg
@@ -4,10 +4,10 @@
 # Format is one line per test that is _NOT_ built.
 #
 
-dl05
-fileio
-fsdosfsname01
-iostream
-sptls01
-sptls02
-utf8proc01
+exclude: dl05
+exclude: fileio
+exclude: fsdosfsname01
+exclude: iostream
+exclude: sptls01
+exclude: sptls02
+exclude: utf8proc01
diff --git a/c/src/lib/libbsp/m68k/mvme162/make/custom/mvme162-testsuite.tcfg b/c/src/lib/libbsp/m68k/mvme162/make/custom/mvme162-testsuite.tcfg
index 7b7b636..8476d8e 100644
--- a/c/src/lib/libbsp/m68k/mvme162/make/custom/mvme162-testsuite.tcfg
+++ b/c/src/lib/libbsp/m68k/mvme162/make/custom/mvme162-testsuite.tcfg
@@ -4,4 +4,4 @@
 # Format is one line per test that is _NOT_ built.
 #
 
-fsdosfsname01
+exclude: fsdosfsname01
diff --git a/c/src/lib/libbsp/m68k/mvme162/make/custom/mvme162lx-testsuite.tcfg b/c/src/lib/libbsp/m68k/mvme162/make/custom/mvme162lx-testsuite.tcfg
index c10c585..f1f6802 100644
--- a/c/src/lib/libbsp/m68k/mvme162/make/custom/mvme162lx-testsuite.tcfg
+++ b/c/src/lib/libbsp/m68k/mvme162/make/custom/mvme162lx-testsuite.tcfg
@@ -4,4 +4,4 @@
 # Format is one line per test that is _NOT_ built.
 #
 
-fsdosfsname01
+exclude: fsdosfsname01
diff --git a/c/src/lib/libbsp/mips/hurricane/make/custom/hurricane-testsuite.tcfg b/c/src/lib/libbsp/mips/hurricane/make/custom/hurricane-testsuite.tcfg
index 8728642..fb84b55 100644
--- a/c/src/lib/libbsp/mips/hurricane/make/custom/hurricane-testsuite.tcfg
+++ b/c/src/lib/libbsp/mips/hurricane/make/custom/hurricane-testsuite.tcfg
@@ -1,5 +1,5 @@
 #
-#  This is the set of tests which are known to not link on this BSP
+# This is the set of tests which are known to not link on this BSP
 #
 
 include: testdata/dltests-broken-on-this-bsp.tcfg
diff --git a/c/src/lib/libbsp/mips/jmr3904/make/custom/jmr3904-testsuite.tcfg b/c/src/lib/libbsp/mips/jmr3904/make/custom/jmr3904-testsuite.tcfg
index b1eafc5..a8d24a0 100644
--- a/c/src/lib/libbsp/mips/jmr3904/make/custom/jmr3904-testsuite.tcfg
+++ b/c/src/lib/libbsp/mips/jmr3904/make/custom/jmr3904-testsuite.tcfg
@@ -6,4 +6,4 @@ include: testdata/disable-intrcritical-tests.tcfg
 
 # The simulator catches the data access fault and exits before the
 # simulated MIPS handler can run.
-spfatal26
+exclude: spfatal26
diff --git a/c/src/lib/libbsp/mips/rbtx4925/make/custom/rbtx4925-testsuite.tcfg b/c/src/lib/libbsp/mips/rbtx4925/make/custom/rbtx4925-testsuite.tcfg
index 8728642..fb84b55 100644
--- a/c/src/lib/libbsp/mips/rbtx4925/make/custom/rbtx4925-testsuite.tcfg
+++ b/c/src/lib/libbsp/mips/rbtx4925/make/custom/rbtx4925-testsuite.tcfg
@@ -1,5 +1,5 @@
 #
-#  This is the set of tests which are known to not link on this BSP
+# This is the set of tests which are known to not link on this BSP
 #
 
 include: testdata/dltests-broken-on-this-bsp.tcfg
diff --git a/c/src/lib/libbsp/mips/rbtx4938/make/custom/rbtx4938-testsuite.tcfg b/c/src/lib/libbsp/mips/rbtx4938/make/custom/rbtx4938-testsuite.tcfg
index 8728642..fb84b55 100644
--- a/c/src/lib/libbsp/mips/rbtx4938/make/custom/rbtx4938-testsuite.tcfg
+++ b/c/src/lib/libbsp/mips/rbtx4938/make/custom/rbtx4938-testsuite.tcfg
@@ -1,5 +1,5 @@
 #
-#  This is the set of tests which are known to not link on this BSP
+# This is the set of tests which are known to not link on this BSP
 #
 
 include: testdata/dltests-broken-on-this-bsp.tcfg
diff --git a/c/src/lib/libbsp/or1k/generic_or1k/make/custom/generic_or1k-testsuite.tcfg b/c/src/lib/libbsp/or1k/generic_or1k/make/custom/generic_or1k-testsuite.tcfg
index b8e4a7a..12d9766 100644
--- a/c/src/lib/libbsp/or1k/generic_or1k/make/custom/generic_or1k-testsuite.tcfg
+++ b/c/src/lib/libbsp/or1k/generic_or1k/make/custom/generic_or1k-testsuite.tcfg
@@ -1,5 +1,5 @@
 #
-#  generic_or1k RTEMS Test Database.
+# generic_or1k RTEMS Test Database.
 #
 
 include: testdata/disable-intrcritical-tests.tcfg
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/gwlcfm-testsuite.tcfg b/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/gwlcfm-testsuite.tcfg
index 810c76a..3dc1e2f 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/gwlcfm-testsuite.tcfg
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/gwlcfm-testsuite.tcfg
@@ -5,12 +5,12 @@
 #
 
 include: testdata/dltests-broken-on-this-bsp.tcfg
-fsdosfsname01
-jffs2_fserror
-jffs2_fslink
-jffs2_fspatheval
-jffs2_fspermission
-jffs2_fsrdwr
-jffs2_fsscandir01
-jffs2_fssymlink
-jffs2_fstime
+exclude: fsdosfsname01
+exclude: jffs2_fserror
+exclude: jffs2_fslink
+exclude: jffs2_fspatheval
+exclude: jffs2_fspermission
+exclude: jffs2_fsrdwr
+exclude: jffs2_fsscandir01
+exclude: jffs2_fssymlink
+exclude: jffs2_fstime
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5566evb-testsuite.tcfg b/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5566evb-testsuite.tcfg
index 654282e..68b04d9 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5566evb-testsuite.tcfg
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5566evb-testsuite.tcfg
@@ -5,12 +5,12 @@
 #
 
 include: testdata/dltests-broken-on-this-bsp.tcfg
-fsdosfsname01
-jffs2_fserror
-jffs2_fslink
-jffs2_fspatheval
-jffs2_fspermission
-jffs2_fsrdwr
-jffs2_fsscandir01
-jffs2_fssymlink
-jffs2_fstime
+exclude: fsdosfsname01
+exclude: jffs2_fserror
+exclude: jffs2_fslink
+exclude: jffs2_fspatheval
+exclude: jffs2_fspermission
+exclude: jffs2_fsrdwr
+exclude: jffs2_fsscandir01
+exclude: jffs2_fssymlink
+exclude: jffs2_fstime
diff --git 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
index 28fd3e7..f4dc6bf 100644
--- 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
@@ -5,12 +5,12 @@
 #
 
 include: testdata/dltests-broken-on-this-bsp.tcfg
-fsdosfsname01
-jffs2_fserror
-jffs2_fslink
-jffs2_fspatheval
-jffs2_fspermission
-jffs2_fsrdwr
-jffs2_fsscandir01
-jffs2_fssymlink
-jffs2_fstime
+exclude: fsdosfsname01
+exclude: jffs2_fserror
+exclude: jffs2_fslink
+exclude: jffs2_fspatheval
+exclude: jffs2_fspermission
+exclude: jffs2_fsrdwr
+exclude: jffs2_fsscandir01
+exclude: jffs2_fssymlink
+exclude: jffs2_fstime
diff --git 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
index 45c0d2f..0b9e4a9 100644
--- 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
@@ -5,14 +5,14 @@
 #
 
 include: testdata/dltests-broken-on-this-bsp.tcfg
-flashdisk01
-fsdosfsname01
-jffs2_fserror
-jffs2_fslink
-jffs2_fspatheval
-jffs2_fspermission
-jffs2_fsrdwr
-jffs2_fsscandir01
-jffs2_fssymlink
-jffs2_fstime
-spstkalloc02
+exclude: flashdisk01
+exclude: fsdosfsname01
+exclude: jffs2_fserror
+exclude: jffs2_fslink
+exclude: jffs2_fspatheval
+exclude: jffs2_fspermission
+exclude: jffs2_fsrdwr
+exclude: jffs2_fsscandir01
+exclude: jffs2_fssymlink
+exclude: jffs2_fstime
+exclude: spstkalloc02
diff --git 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
index 3e1e88e..3255f39 100644
--- 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
@@ -5,14 +5,14 @@
 #
 
 include: testdata/dltests-broken-on-this-bsp.tcfg
-flashdisk01
-fsdosfsname01
-jffs2_fserror
-jffs2_fslink
-jffs2_fspatheval
-jffs2_fspermission
-jffs2_fsrdwr
-jffs2_fsscandir01
-jffs2_fssymlink
-jffs2_fstime
-spstkalloc02
+exclude: flashdisk01
+exclude: fsdosfsname01
+exclude: jffs2_fserror
+exclude: jffs2_fslink
+exclude: jffs2_fspatheval
+exclude: jffs2_fspermission
+exclude: jffs2_fsrdwr
+exclude: jffs2_fsscandir01
+exclude: jffs2_fssymlink
+exclude: jffs2_fstime
+exclude: spstkalloc02
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5668g-testsuite.tcfg b/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5668g-testsuite.tcfg
index 8728642..fb84b55 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5668g-testsuite.tcfg
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5668g-testsuite.tcfg
@@ -1,5 +1,5 @@
 #
-#  This is the set of tests which are known to not link on this BSP
+# This is the set of tests which are known to not link on this BSP
 #
 
 include: testdata/dltests-broken-on-this-bsp.tcfg
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5674f_ecu508_app-testsuite.tcfg b/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5674f_ecu508_app-testsuite.tcfg
index 8728642..fb84b55 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5674f_ecu508_app-testsuite.tcfg
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5674f_ecu508_app-testsuite.tcfg
@@ -1,5 +1,5 @@
 #
-#  This is the set of tests which are known to not link on this BSP
+# This is the set of tests which are known to not link on this BSP
 #
 
 include: testdata/dltests-broken-on-this-bsp.tcfg
diff --git 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
index 77f4a24..c1b32f1 100644
--- 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
@@ -5,4 +5,4 @@
 #
 
 include: testdata/dltests-broken-on-this-bsp.tcfg
-fsdosfsname01
+exclude: fsdosfsname01
diff --git 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
index ee9e62c..8dca09f 100644
--- 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
@@ -5,4 +5,4 @@
 #
 
 include: testdata/dltests-broken-on-this-bsp.tcfg
-fsdosfsname01
+exclude: fsdosfsname01
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5674fevb-testsuite.tcfg b/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5674fevb-testsuite.tcfg
index 8728642..fb84b55 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5674fevb-testsuite.tcfg
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5674fevb-testsuite.tcfg
@@ -1,5 +1,5 @@
 #
-#  This is the set of tests which are known to not link on this BSP
+# This is the set of tests which are known to not link on this BSP
 #
 
 include: testdata/dltests-broken-on-this-bsp.tcfg
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5674fevb_spe-testsuite.tcfg b/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5674fevb_spe-testsuite.tcfg
index 8728642..fb84b55 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5674fevb_spe-testsuite.tcfg
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/make/custom/mpc5674fevb_spe-testsuite.tcfg
@@ -1,5 +1,5 @@
 #
-#  This is the set of tests which are known to not link on this BSP
+# This is the set of tests which are known to not link on this BSP
 #
 
 include: testdata/dltests-broken-on-this-bsp.tcfg
diff --git 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
index 6b4886b..949d3b0 100644
--- 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
@@ -5,12 +5,12 @@
 #
 
 include: testdata/dltests-broken-on-this-bsp.tcfg
-fsdosfsname01
-jffs2_fserror
-jffs2_fslink
-jffs2_fspatheval
-jffs2_fspermission
-jffs2_fsrdwr
-jffs2_fsscandir01
-jffs2_fssymlink
-jffs2_fstime
+exclude: fsdosfsname01
+exclude: jffs2_fserror
+exclude: jffs2_fslink
+exclude: jffs2_fspatheval
+exclude: jffs2_fspermission
+exclude: jffs2_fsrdwr
+exclude: jffs2_fsscandir01
+exclude: jffs2_fssymlink
+exclude: jffs2_fstime
diff --git a/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_core_0-testsuite.tcfg b/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_core_0-testsuite.tcfg
index 8728642..fb84b55 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_core_0-testsuite.tcfg
+++ b/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_core_0-testsuite.tcfg
@@ -1,5 +1,5 @@
 #
-#  This is the set of tests which are known to not link on this BSP
+# This is the set of tests which are known to not link on this BSP
 #
 
 include: testdata/dltests-broken-on-this-bsp.tcfg
diff --git a/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_core_1-testsuite.tcfg b/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_core_1-testsuite.tcfg
index 8728642..fb84b55 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_core_1-testsuite.tcfg
+++ b/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_core_1-testsuite.tcfg
@@ -1,5 +1,5 @@
 #
-#  This is the set of tests which are known to not link on this BSP
+# This is the set of tests which are known to not link on this BSP
 #
 
 include: testdata/dltests-broken-on-this-bsp.tcfg
diff --git a/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_p1020rdb-testsuite.tcfg b/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_p1020rdb-testsuite.tcfg
index 8728642..fb84b55 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_p1020rdb-testsuite.tcfg
+++ b/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_p1020rdb-testsuite.tcfg
@@ -1,5 +1,5 @@
 #
-#  This is the set of tests which are known to not link on this BSP
+# This is the set of tests which are known to not link on this BSP
 #
 
 include: testdata/dltests-broken-on-this-bsp.tcfg
diff --git a/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_t2080rdb-testsuite.tcfg b/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_t2080rdb-testsuite.tcfg
index 8728642..fb84b55 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_t2080rdb-testsuite.tcfg
+++ b/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_t2080rdb-testsuite.tcfg
@@ -1,5 +1,5 @@
 #
-#  This is the set of tests which are known to not link on this BSP
+# This is the set of tests which are known to not link on this BSP
 #
 
 include: testdata/dltests-broken-on-this-bsp.tcfg
diff --git a/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_t4240rdb-testsuite.tcfg b/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_t4240rdb-testsuite.tcfg
index 8728642..fb84b55 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_t4240rdb-testsuite.tcfg
+++ b/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_t4240rdb-testsuite.tcfg
@@ -1,5 +1,5 @@
 #
-#  This is the set of tests which are known to not link on this BSP
+# This is the set of tests which are known to not link on this BSP
 #
 
 include: testdata/dltests-broken-on-this-bsp.tcfg
diff --git a/c/src/lib/libbsp/sh/gensh1/make/custom/gensh1-testsuite.tcfg b/c/src/lib/libbsp/sh/gensh1/make/custom/gensh1-testsuite.tcfg
index 8612613..b7eff63 100644
--- a/c/src/lib/libbsp/sh/gensh1/make/custom/gensh1-testsuite.tcfg
+++ b/c/src/lib/libbsp/sh/gensh1/make/custom/gensh1-testsuite.tcfg
@@ -4,7 +4,7 @@
 # Format is one line per test that is _NOT_ built.
 #
 
-fileio
-fsdosfsname01
-iostream
-utf8proc01
+exclude: fileio
+exclude: fsdosfsname01
+exclude: iostream
+exclude: utf8proc01
diff --git a/c/src/lib/libbsp/sh/gensh2/make/custom/gensh2-testsuite.tcfg b/c/src/lib/libbsp/sh/gensh2/make/custom/gensh2-testsuite.tcfg
index 2db5955..f588115 100644
--- a/c/src/lib/libbsp/sh/gensh2/make/custom/gensh2-testsuite.tcfg
+++ b/c/src/lib/libbsp/sh/gensh2/make/custom/gensh2-testsuite.tcfg
@@ -4,7 +4,7 @@
 # Format is one line per test that is _NOT_ built.
 #
 
-fileio
-fsdosfsname01
-iostream
-utf8proc01
+exclude: fileio
+exclude: fsdosfsname01
+exclude: iostream
+exclude: utf8proc01
diff --git a/c/src/lib/libbsp/sh/shsim/make/custom/simsh1-testsuite.tcfg b/c/src/lib/libbsp/sh/shsim/make/custom/simsh1-testsuite.tcfg
index 542f689..6e409fb 100644
--- a/c/src/lib/libbsp/sh/shsim/make/custom/simsh1-testsuite.tcfg
+++ b/c/src/lib/libbsp/sh/shsim/make/custom/simsh1-testsuite.tcfg
@@ -7,7 +7,7 @@
 include: testdata/require-tick-isr.tcfg
 include: testdata/disable-intrcritical-tests.tcfg
 
-fileio
-fsdosfsname01
-iostream
-utf8proc01
+exclude: fileio
+exclude: fsdosfsname01
+exclude: iostream
+exclude: utf8proc01
diff --git a/c/src/lib/libbsp/sh/shsim/make/custom/simsh2-testsuite.tcfg b/c/src/lib/libbsp/sh/shsim/make/custom/simsh2-testsuite.tcfg
index 620d43d..1ce2c19 100644
--- a/c/src/lib/libbsp/sh/shsim/make/custom/simsh2-testsuite.tcfg
+++ b/c/src/lib/libbsp/sh/shsim/make/custom/simsh2-testsuite.tcfg
@@ -7,7 +7,7 @@
 include: testdata/require-tick-isr.tcfg
 include: testdata/disable-intrcritical-tests.tcfg
 
-fileio
-fsdosfsname01
-iostream
-utf8proc01
+exclude: fileio
+exclude: fsdosfsname01
+exclude: iostream
+exclude: utf8proc01
diff --git a/c/src/lib/libbsp/sh/shsim/make/custom/simsh2e-testsuite.tcfg b/c/src/lib/libbsp/sh/shsim/make/custom/simsh2e-testsuite.tcfg
index 9ecaa70..945aee1 100644
--- a/c/src/lib/libbsp/sh/shsim/make/custom/simsh2e-testsuite.tcfg
+++ b/c/src/lib/libbsp/sh/shsim/make/custom/simsh2e-testsuite.tcfg
@@ -6,7 +6,7 @@
 include: testdata/require-tick-isr.tcfg
 include: testdata/disable-intrcritical-tests.tcfg
 
-fileio
-fsdosfsname01
-iostream
-utf8proc01
+exclude: fileio
+exclude: fsdosfsname01
+exclude: iostream
+exclude: utf8proc01
diff --git a/c/src/lib/libbsp/sh/shsim/make/custom/simsh4-testsuite.tcfg b/c/src/lib/libbsp/sh/shsim/make/custom/simsh4-testsuite.tcfg
index 848daf3..b3a1953 100644
--- a/c/src/lib/libbsp/sh/shsim/make/custom/simsh4-testsuite.tcfg
+++ b/c/src/lib/libbsp/sh/shsim/make/custom/simsh4-testsuite.tcfg
@@ -6,7 +6,7 @@
 include: testdata/require-tick-isr.tcfg
 include: testdata/disable-intrcritical-tests.tcfg
 
-fileio
-fsdosfsname01
-iostream
-utf8proc01
+exclude: fileio
+exclude: fsdosfsname01
+exclude: iostream
+exclude: utf8proc01
diff --git a/c/src/lib/libbsp/sparc/erc32/make/custom/erc32-testsuite.tcfg b/c/src/lib/libbsp/sparc/erc32/make/custom/erc32-testsuite.tcfg
new file mode 100644
index 0000000..cee7ce5
--- /dev/null
+++ b/c/src/lib/libbsp/sparc/erc32/make/custom/erc32-testsuite.tcfg
@@ -0,0 +1,4 @@
+#
+# Excpected failures.
+#
+expected-fail: dl05
diff --git a/testsuites/automake/compile.am b/testsuites/automake/compile.am
index 643e580..d5545c5 100644
--- a/testsuites/automake/compile.am
+++ b/testsuites/automake/compile.am
@@ -9,7 +9,7 @@ SIZE = @SIZE@
 STRIP = @STRIP@
 
 ##
-AM_CPPFLAGS =
+AM_CPPFLAGS = $(TEST_FLAGS)
 AM_CFLAGS =
 AM_CXXFLAGS =
 
diff --git a/testsuites/automake/test-subdirs.am b/testsuites/automake/test-subdirs.am
index ff339aa..380aae1 100644
--- a/testsuites/automake/test-subdirs.am
+++ b/testsuites/automake/test-subdirs.am
@@ -22,12 +22,19 @@ all-local:
 	fi; \
 	echo "BSP Testsuite Data: $$vtdata"; \
 	list=`$(top_srcdir)/../../tools/build/rtems-test-check \
-		 $$tdata $(top_srcdir)/.. $(RTEMS_BSP) $(_SUBDIRS)`; \
+		 exclude $$tdata $(top_srcdir)/.. $(RTEMS_BSP) $(_SUBDIRS)`; \
 	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" != "."; then \
+            test_FLAGS=`$(top_srcdir)/../../tools/build/rtems-test-check \
+			 flags $$tdata $(top_srcdir)/.. $(RTEMS_BSP) $$subdir`; \
 	    local_target="$$target"; \
-	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	    if test -z "$$test_FLAGS"; then \
+		echo "BSP Testsuite Flags: $$subdir: PASS"; \
+	    else \
+		echo "BSP Testsuite Flags: $$subdir: $$test_FLAGS"; \
+	    fi; \
+	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) TEST_FLAGS="$$test_FLAGS" $$local_target) \
 	     || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
 	  fi; \
 	done; test -z "$$fail"
diff --git a/testsuites/support/include/buffer_test_io.h b/testsuites/support/include/buffer_test_io.h
index ac73352..174b477 100644
--- a/testsuites/support/include/buffer_test_io.h
+++ b/testsuites/support/include/buffer_test_io.h
@@ -21,6 +21,20 @@ extern "C" {
 /* #define TESTS_USE_PRINTK */
 
 /*
+ * Test states. No state string is an expected pass.
+ */
+#if TEST_STATE_EXPECTED_FAIL && \
+    TEST_INDETERMINATE_FAIL
+  #error Test states must be unique
+#endif
+
+#if TEST_STATE_EXPECTED_FAIL
+  #define TEST_STATE_STRING "*** TEST STATE: EXPECTED-FAIL\n"
+#elif TEST_INDETERMINATE_FAIL
+  #define TEST_STATE_STRING "*** TEST STATE: INDETERMINATE\n"
+#endif
+
+/*
  *  USE PRINTK TO MINIMIZE SIZE
  */
 #if defined(TESTS_USE_PRINTK)
@@ -55,7 +69,11 @@ extern "C" {
     do { \
     } while (0)
 
-  #define TEST_BEGIN() printk(TEST_BEGIN_STRING)
+  #if defined(TEST_STATE_STRING)
+    #define TEST_BEGIN() printk(TEST_BEGIN_STRING); printk();
+  #else
+    #define TEST_BEGIN() printk(TEST_BEGIN_STRING)
+  #endif
 
   #define TEST_END() printk(TEST_END_STRING)
 
@@ -157,7 +175,11 @@ extern "C" {
       fflush(stdout); \
     } while (0)
 
-  #define TEST_BEGIN() printf(TEST_BEGIN_STRING)
+  #if defined(TEST_STATE_STRING)
+    #define TEST_BEGIN() printf(TEST_BEGIN_STRING); printf(TEST_STATE_STRING)
+  #else
+    #define TEST_BEGIN() printf(TEST_BEGIN_STRING)
+  #endif
 
   #define TEST_END() printf(TEST_END_STRING)
 
@@ -206,7 +228,11 @@ extern "C" {
       fflush(stdout); \
     } while (0)
 
-  #define TEST_BEGIN() fiprintf( stderr, TEST_BEGIN_STRING)
+  #if defined(TEST_STATE_STRING)
+    #define TEST_BEGIN() fiprintf(stderr, TEST_BEGIN_STRING); fiprintf(stderr, TEST_STATE_STRING)
+  #else
+    #define TEST_BEGIN() fiprintf(stderr, TEST_BEGIN_STRING)
+  #endif
 
   #define TEST_END()  fiprintf( stderr, TEST_END_STRING)
 
diff --git a/testsuites/testdata/disable-intrcritical-tests.tcfg b/testsuites/testdata/disable-intrcritical-tests.tcfg
index ef36333..9fc4acb 100644
--- a/testsuites/testdata/disable-intrcritical-tests.tcfg
+++ b/testsuites/testdata/disable-intrcritical-tests.tcfg
@@ -4,27 +4,27 @@
 # 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
+exclude: psxintrcritical01
+exclude: spintrcritical01
+exclude: spintrcritical02
+exclude: spintrcritical03
+exclude: spintrcritical04
+exclude: spintrcritical05
+exclude: spintrcritical06
+exclude: spintrcritical07
+exclude: spintrcritical08
+exclude: spintrcritical09
+exclude: spintrcritical10
+exclude: spintrcritical11
+exclude: spintrcritical12
+exclude: spintrcritical13
+exclude: spintrcritical14
+exclude: spintrcritical15
+exclude: spintrcritical16
+exclude: spintrcritical17
+exclude: spintrcritical18
+exclude: spintrcritical20
+exclude: spintrcritical21
+exclude: spintrcritical22
+exclude: spintrcritical23
 
diff --git a/testsuites/testdata/disable-jffs2-tests.tcfg b/testsuites/testdata/disable-jffs2-tests.tcfg
index 116baa0..dda8044 100644
--- a/testsuites/testdata/disable-jffs2-tests.tcfg
+++ b/testsuites/testdata/disable-jffs2-tests.tcfg
@@ -2,11 +2,11 @@
 # Some targets cannot declare the RAM disk space for the JFFS2 tests.
 #
 
-jffs2_fserror
-jffs2_fslink
-jffs2_fspatheval
-jffs2_fspermission
-jffs2_fsrdwr
-jffs2_fsscandir01
-jffs2_fssymlink
-jffs2_fstime
+exclude: jffs2_fserror
+exclude: jffs2_fslink
+exclude: jffs2_fspatheval
+exclude: jffs2_fspermission
+exclude: jffs2_fsrdwr
+exclude: jffs2_fsscandir01
+exclude: jffs2_fssymlink
+exclude: jffs2_fstime
diff --git a/testsuites/testdata/disable-mrfs-tests.tcfg b/testsuites/testdata/disable-mrfs-tests.tcfg
index fc2287d..d5dcaf0 100644
--- a/testsuites/testdata/disable-mrfs-tests.tcfg
+++ b/testsuites/testdata/disable-mrfs-tests.tcfg
@@ -2,12 +2,12 @@
 # Some targets cannot declare the RAM disk space for the mounted RFS tests.
 #
 
-mrfs_fserror
-mrfs_fsfpathconf
-mrfs_fslink
-mrfs_fspatheval
-mrfs_fspermission
-mrfs_fsrdwr
-mrfs_fsscandir01
-mrfs_fssymlink
-mrfs_fstime
+exclude: mrfs_fserror
+exclude: mrfs_fsfpathconf
+exclude: mrfs_fslink
+exclude: mrfs_fspatheval
+exclude: mrfs_fspermission
+exclude: mrfs_fsrdwr
+exclude: mrfs_fsscandir01
+exclude: mrfs_fssymlink
+exclude: mrfs_fstime
diff --git a/testsuites/testdata/dltests-broken-on-this-bsp.tcfg b/testsuites/testdata/dltests-broken-on-this-bsp.tcfg
index 6dbbe14..96e575c 100644
--- a/testsuites/testdata/dltests-broken-on-this-bsp.tcfg
+++ b/testsuites/testdata/dltests-broken-on-this-bsp.tcfg
@@ -4,8 +4,8 @@
 # This file should be included by those BSPs which have dl* test issues
 # which remain to be investigated and solved.
 #
-dl01
-dl02
-dl03
-dl04
-dl05
+exclude: dl01
+exclude: dl02
+exclude: dl03
+exclude: dl04
+exclude: dl05
diff --git a/testsuites/testdata/require-tick-isr.tcfg b/testsuites/testdata/require-tick-isr.tcfg
index 8231acb..d3d9d32 100644
--- a/testsuites/testdata/require-tick-isr.tcfg
+++ b/testsuites/testdata/require-tick-isr.tcfg
@@ -6,12 +6,12 @@
 # Tests which do not work with this clock driver tend to have the
 # one of the following characteristics:
 #
-#  + Assume that a clock tick will occur while a task is running
-#    continuously can be
-#  + Assume that a timer service routine will execute in an ISR
-#    while a task is running continously.
-#  + Has a busy spin loop waiting to start the test on a tick boundary
-#    does this.
+# + Assume that a clock tick will occur while a task is running
+# continuously can be
+# + Assume that a timer service routine will execute in an ISR
+# while a task is running continously.
+# + Has a busy spin loop waiting to start the test on a tick boundary
+# does this.
 #
 # Eventually there should be a way to note that a BSP has a list
 # of expected test failures which are specific to it AND a set of
@@ -19,54 +19,54 @@
 # inappropriate. At that point, this would be one characteristic.
 #
 # NOTE: Each test in this list should be reviewed to ensure that it
-#       has a legitimate reason to not run on a BSP with the simulator
-#       clock idle task. It may need to be broken into multiple tests
-#       if not executing it misses other paths.
+# has a legitimate reason to not run on a BSP with the simulator
+# clock idle task. It may need to be broken into multiple tests
+# if not executing it misses other paths.
 #
-cpuuse
-psx07
-psx09
-psx10
-psx11
-psxcancel01
-psxgetrusage01
-psxintrcritical01
-psxsignal01
-psxsignal02
-psxspin01
-psxtime
-psxtimes01
-sp04
-sp14
-sp19
-sp35
-sp38
-sp44
-sp69
-spcbssched02
-spcbssched03
-spcontext01
-spcpucounter01
-spedfsched03
-spintrcritical01
-spintrcritical02
-spintrcritical03
-spintrcritical04
-spintrcritical05
-spintrcritical06
-spintrcritical07
-spintrcritical08
-spintrcritical09
-spintrcritical10
-spintrcritical11
-spintrcritical12
-spintrcritical13
-spintrcritical14
-spintrcritical15
-spintrcritical16
-spintrcritical17
-spintrcritical18
-spintrcritical19
-spintrcritical20
-spnsext01
-spqreslib
+exclude: cpuuse
+exclude: psx07
+exclude: psx09
+exclude: psx10
+exclude: psx11
+exclude: psxcancel01
+exclude: psxgetrusage01
+exclude: psxintrcritical01
+exclude: psxsignal01
+exclude: psxsignal02
+exclude: psxspin01
+exclude: psxtime
+exclude: psxtimes01
+exclude: sp04
+exclude: sp14
+exclude: sp19
+exclude: sp35
+exclude: sp38
+exclude: sp44
+exclude: sp69
+exclude: spcbssched02
+exclude: spcbssched03
+exclude: spcontext01
+exclude: spcpucounter01
+exclude: spedfsched03
+exclude: spintrcritical01
+exclude: spintrcritical02
+exclude: spintrcritical03
+exclude: spintrcritical04
+exclude: spintrcritical05
+exclude: spintrcritical06
+exclude: spintrcritical07
+exclude: spintrcritical08
+exclude: spintrcritical09
+exclude: spintrcritical10
+exclude: spintrcritical11
+exclude: spintrcritical12
+exclude: spintrcritical13
+exclude: spintrcritical14
+exclude: spintrcritical15
+exclude: spintrcritical16
+exclude: spintrcritical17
+exclude: spintrcritical18
+exclude: spintrcritical19
+exclude: spintrcritical20
+exclude: spnsext01
+exclude: spqreslib
diff --git a/tools/build/rtems-test-check b/tools/build/rtems-test-check
index 2411dd1..e02f8e9 100755
--- a/tools/build/rtems-test-check
+++ b/tools/build/rtems-test-check
@@ -1,18 +1,21 @@
 #! /bin/sh
 #
-# Copyright 2014 Chris Johns <chrisj at rtems.org>
+# Copyright 2014, 2016 Chris Johns <chrisj at rtems.org>
 # All rights reserved
 #
 
 #
-# usage: rtems-test-check <bsp-test-database> <includes> <bsp> <tests..>
+# usage: rtems-test-check <mode> <bsp-test-database> <includes> <bsp> <tests..>
 #
 
-if test $# -lt 3; then
+if test $# -lt 4; then
   echo "error: invalid command line" >&2
+  echo "INVALID-TEST-DATA"
   exit 2
 fi
 
+mode="$1"
+shift
 testdata="$1"
 shift
 includepath="$1"
@@ -20,14 +23,39 @@ shift
 bsp="$1"
 shift
 tests="$*"
-bsp_tests=${tests}
+
+test_count=0
+for t in ${tests};
+do
+ test_count=$(expr ${test_count} + 1)
+done
+
+case ${mode} in
+ exclude)
+   output=${tests}
+   ;;
+ flags)
+   if [ $test_count != 1 ]; then
+     echo "error: test count not 1 for ${mode}" 1>&2
+     exit 1
+   fi
+   output=""
+   ;;
+ *)
+   echo "error: invalid mode" 1>&2
+   echo "INVALID-TEST-DATA"
+   exit 1
+   ;;
+esac
 
 #
-# If there is no testdata all tests are valid.
+# If there is no testdata all tests are valid and must pass.
 #
 
 if test -f $testdata; then
-  disabled_tests=""
+  excluded_tests=""
+  expected_fails=""
+  indeterminates=""
   while [ ! -z "$testdata" ];
   do
     for td in $testdata;
@@ -39,38 +67,84 @@ if test -f $testdata; then
       do
         line=$(echo $line | sed -e 's/#.*$//' -e '/^$/d')
         if [ ! -z "$line" ]; then
-          include=$(echo $line | sed -e "s/include:.*/yes/g")
-          if [ "$include" = "yes" ]; then
-            inf=$(echo $line | sed -e "s/include://g" -e 's/^[ \t]//;s/[ \t]$//')
-	    if test -f $includepath/$inf; then
-              ntd="$includepath/$inf $ntd"
-            fi
-          else
-            disabled_tests="${disabled_tests} $line"
-          fi
+          state=$(echo $line | sed -e "s/:.*//g")
+          case $state in
+            include)
+              inf=$(echo $line | sed -e "s/include://g" -e 's/^[ \t]//;s/[ \t]$//')
+              if test -f $includepath/$inf; then
+                ntd="$includepath/$inf $ntd"
+              fi
+              ;;
+            exclude)
+              line=$(echo $line | sed -e "s/exclude://g" -e 's/^[ \t]//;s/[ \t]$//')
+              excluded_tests="${excluded_tests} $line"
+              ;;
+            expected-fail)
+              line=$(echo $line | sed -e "s/expected-fail://g" -e 's/^[ \t]//;s/[ \t]$//')
+              expected_fails="${expected_fails} $line"
+              ;;
+            indeterminate)
+              line=$(echo $line | sed -e "s/indeterminate://g" -e 's/^[ \t]//;s/[ \t]$//')
+              indeterminates="${indeterminates} $line"
+              ;;
+            *)
+              echo "error: invalid test state: $state in $td" 1>&2
+              echo "INVALID-TEST-DATA"
+              exit 1
+              ;;
+          esac
         fi
       done
     done
     testdata=$ntd
   done
 
-  bsp_tests=""
   for t in ${tests};
   do
-    allow="yes"
-    for dt in ${disabled_tests};
-    do
-      if test ${t} = ${dt}; then
+    case ${mode} in
+      exclude)
+        allow="yes"
+        for dt in ${excluded_tests};
+        do
+          if test ${t} = ${dt}; then
+            allow="no"
+          fi
+        done
+        if test ${allow} = yes; then
+          output="${output} ${t}"
+        fi
+        ;;
+      flags)
         allow="no"
-      fi
-    done
-    if test ${allow} = yes; then
-      bsp_tests="${bsp_tests} ${t}"
-    fi
+        for et in ${expected_fails};
+        do
+          if test ${t} = ${et}; then
+            allow="yes"
+          fi
+        done
+        if test ${allow} = yes; then
+          output="-DTEST_STATE_EXPECTED_FAIL=1"
+        fi
+        allow="no"
+        for it in ${indeterminates};
+        do
+          if test ${t} = ${it}; then
+            allow="yes"
+          fi
+        done
+        if test ${allow} = yes; then
+          output="${output} -DTEST_STATE_INDETERMINATE=1"
+        fi
+        ;;
+      *)
+        echo "error: invalid mode" 1>&2
+        echo "INVALID-TEST-DATA"
+        exit 1
+        ;;
+    esac
   done
 fi
 
-echo ${bsp_tests}
+echo ${output}
 
 exit 0
-
-- 
2.9.0



More information about the devel mailing list