testsuite: Add test states to the testsuit configuration files.

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.

56 files changed, 514 insertions, 510 deletions

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 62c9a53f0b..b209cd35d9 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 7e4b504611..1806a08ab0 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 0fca79c3d8..654fa10602 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 a8617cac7a..01cb8d9e78 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 8240f55467..05701f9681 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 c4eaea60c5..e2e1d21541 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 fb7a6d8935..5c6e6a4770 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 d62cd73824..9af058d447 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 51e8009a04..b5782e4a13 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 88dedf35b5..7038fca2dd 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 b046aad66b..d3e2972f1f 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 29887c9c5e..94d3dd41ad 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 8b465d30ef..87591405c4 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 b8b9bbec7d..38496510cd 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 cd40568945..e61f406f3f 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 29a1cc9c57..791f60878d 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 764b0c2c48..cca0e6230c 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 d277e8afa3..9889f84858 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 d0f7da86e5..31bae1421b 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 bb72c04142..38c6578473 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 c522616583..618806be81 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 c904280e0f..d11a487569 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 9b3841b96b..b806080b35 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 1fd3b6a544..38dfab8dcd 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 6cfd8a8cd6..b853319c76 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 7b7b636a92..8476d8ecff 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 c10c585dcd..f1f680287a 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 8728642069..fb84b55762 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 b1eafc57cc..a8d24a09a9 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 8728642069..fb84b55762 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 8728642069..fb84b55762 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 b8e4a7a74d..12d9766992 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 810c76ad44..3dc1e2fce2 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 654282ebdf..68b04d9aa1 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 28fd3e79be..f4dc6bfde2 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 45c0d2f679..0b9e4a943c 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 3e1e88ec1a..3255f39f9d 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 8728642069..fb84b55762 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 8728642069..fb84b55762 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 77f4a24a18..c1b32f11e0 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 ee9e62c947..8dca09f2b6 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 8728642069..fb84b55762 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 8728642069..fb84b55762 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 6b4886b39d..949d3b02f0 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 8728642069..fb84b55762 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 8728642069..fb84b55762 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 8728642069..fb84b55762 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 8728642069..fb84b55762 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 8728642069..fb84b55762 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 8612613b58..b7eff63056 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 2db5955ef4..f588115b4d 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 542f689e34..6e409fb47f 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 620d43dd92..1ce2c19759 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 9ecaa70db4..945aee15a0 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 848daf3b40..b3a1953e7d 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 0000000000..cee7ce59e5
--- /dev/null
+++ b/c/src/lib/libbsp/sparc/erc32/make/custom/erc32-testsuite.tcfg
@@ -0,0 +1,4 @@
+#
+# Excpected failures.
+#
+expected-fail: dl05