summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2006-07-11 05:09:12 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2006-07-11 05:09:12 +0000
commit9c5ea1114a6d6ba2d816c57d3ac814f14c6249af (patch)
treea892ccf0b2a5fe46cea393bbeab55dc3c6e4829c
parent2006-07-11 Ralf Corsépius <ralf.corsepius@rtems.org> (diff)
downloadrtems-9c5ea1114a6d6ba2d816c57d3ac814f14c6249af.tar.bz2
Eliminate scndir, docdir. Use rtems_testsdir instead.
-rw-r--r--testsuites/mptests/mp01/node1/Makefile.am6
-rw-r--r--testsuites/mptests/mp01/node2/Makefile.am6
-rw-r--r--testsuites/mptests/mp02/node1/Makefile.am6
-rw-r--r--testsuites/mptests/mp02/node2/Makefile.am6
-rw-r--r--testsuites/mptests/mp03/node1/Makefile.am6
-rw-r--r--testsuites/mptests/mp03/node2/Makefile.am6
-rw-r--r--testsuites/mptests/mp04/node1/Makefile.am6
-rw-r--r--testsuites/mptests/mp04/node2/Makefile.am6
-rw-r--r--testsuites/mptests/mp05/node1/Makefile.am6
-rw-r--r--testsuites/mptests/mp05/node2/Makefile.am6
-rw-r--r--testsuites/mptests/mp06/node1/Makefile.am6
-rw-r--r--testsuites/mptests/mp06/node2/Makefile.am6
-rw-r--r--testsuites/mptests/mp07/node1/Makefile.am6
-rw-r--r--testsuites/mptests/mp07/node2/Makefile.am6
-rw-r--r--testsuites/mptests/mp08/node1/Makefile.am6
-rw-r--r--testsuites/mptests/mp08/node2/Makefile.am6
-rw-r--r--testsuites/mptests/mp09/node1/Makefile.am6
-rw-r--r--testsuites/mptests/mp09/node2/Makefile.am6
-rw-r--r--testsuites/mptests/mp10/node1/Makefile.am6
-rw-r--r--testsuites/mptests/mp10/node2/Makefile.am6
-rw-r--r--testsuites/mptests/mp11/node1/Makefile.am6
-rw-r--r--testsuites/mptests/mp11/node2/Makefile.am6
-rw-r--r--testsuites/mptests/mp12/node1/Makefile.am6
-rw-r--r--testsuites/mptests/mp12/node2/Makefile.am6
-rw-r--r--testsuites/mptests/mp13/node1/Makefile.am6
-rw-r--r--testsuites/mptests/mp13/node2/Makefile.am6
-rw-r--r--testsuites/mptests/mp14/node1/Makefile.am6
-rw-r--r--testsuites/mptests/mp14/node2/Makefile.am6
-rw-r--r--testsuites/sptests/sp01/Makefile.am6
-rw-r--r--testsuites/sptests/sp02/Makefile.am6
-rw-r--r--testsuites/sptests/sp03/Makefile.am6
-rw-r--r--testsuites/sptests/sp04/Makefile.am6
-rw-r--r--testsuites/sptests/sp05/Makefile.am6
-rw-r--r--testsuites/sptests/sp06/Makefile.am6
-rw-r--r--testsuites/sptests/sp07/Makefile.am6
-rw-r--r--testsuites/sptests/sp08/Makefile.am6
-rw-r--r--testsuites/sptests/sp09/Makefile.am6
-rw-r--r--testsuites/sptests/sp11/Makefile.am6
-rw-r--r--testsuites/sptests/sp12/Makefile.am6
-rw-r--r--testsuites/sptests/sp13/Makefile.am6
-rw-r--r--testsuites/sptests/sp14/Makefile.am6
-rw-r--r--testsuites/sptests/sp15/Makefile.am6
-rw-r--r--testsuites/sptests/sp16/Makefile.am6
-rw-r--r--testsuites/sptests/sp17/Makefile.am6
-rw-r--r--testsuites/sptests/sp19/Makefile.am6
-rw-r--r--testsuites/sptests/sp20/Makefile.am6
-rw-r--r--testsuites/sptests/sp21/Makefile.am6
-rw-r--r--testsuites/sptests/sp22/Makefile.am6
-rw-r--r--testsuites/sptests/sp23/Makefile.am6
-rw-r--r--testsuites/sptests/sp24/Makefile.am6
-rw-r--r--testsuites/sptests/sp25/Makefile.am6
-rw-r--r--testsuites/sptests/sp26/Makefile.am6
-rw-r--r--testsuites/sptests/sp27/Makefile.am6
-rw-r--r--testsuites/sptests/sp28/Makefile.am6
-rw-r--r--testsuites/sptests/sp29/Makefile.am6
-rw-r--r--testsuites/sptests/sp30/Makefile.am6
-rw-r--r--testsuites/sptests/sp31/Makefile.am6
-rw-r--r--testsuites/sptests/sp32/Makefile.am3
-rw-r--r--testsuites/sptests/spfatal/Makefile.am6
-rw-r--r--testsuites/sptests/spsize/Makefile.am3
-rw-r--r--testsuites/tmitrontests/tmitronsem01/Makefile.am3
-rw-r--r--testsuites/tmtests/tm01/Makefile.am3
-rw-r--r--testsuites/tmtests/tm02/Makefile.am3
-rw-r--r--testsuites/tmtests/tm03/Makefile.am3
-rw-r--r--testsuites/tmtests/tm04/Makefile.am3
-rw-r--r--testsuites/tmtests/tm05/Makefile.am3
-rw-r--r--testsuites/tmtests/tm06/Makefile.am3
-rw-r--r--testsuites/tmtests/tm07/Makefile.am3
-rw-r--r--testsuites/tmtests/tm08/Makefile.am3
-rw-r--r--testsuites/tmtests/tm09/Makefile.am3
-rw-r--r--testsuites/tmtests/tm10/Makefile.am3
-rw-r--r--testsuites/tmtests/tm11/Makefile.am3
-rw-r--r--testsuites/tmtests/tm12/Makefile.am3
-rw-r--r--testsuites/tmtests/tm13/Makefile.am3
-rw-r--r--testsuites/tmtests/tm14/Makefile.am3
-rw-r--r--testsuites/tmtests/tm15/Makefile.am3
-rw-r--r--testsuites/tmtests/tm16/Makefile.am3
-rw-r--r--testsuites/tmtests/tm17/Makefile.am3
-rw-r--r--testsuites/tmtests/tm18/Makefile.am3
-rw-r--r--testsuites/tmtests/tm19/Makefile.am3
-rw-r--r--testsuites/tmtests/tm20/Makefile.am3
-rw-r--r--testsuites/tmtests/tm21/Makefile.am3
-rw-r--r--testsuites/tmtests/tm22/Makefile.am3
-rw-r--r--testsuites/tmtests/tm23/Makefile.am3
-rw-r--r--testsuites/tmtests/tm24/Makefile.am3
-rw-r--r--testsuites/tmtests/tm25/Makefile.am3
-rw-r--r--testsuites/tmtests/tm26/Makefile.am3
-rw-r--r--testsuites/tmtests/tm27/Makefile.am3
-rw-r--r--testsuites/tmtests/tm28/Makefile.am3
-rw-r--r--testsuites/tmtests/tm29/Makefile.am3
-rw-r--r--testsuites/tmtests/tmck/Makefile.am3
-rw-r--r--testsuites/tmtests/tmoverhd/Makefile.am3
92 files changed, 150 insertions, 300 deletions
diff --git a/testsuites/mptests/mp01/node1/Makefile.am b/testsuites/mptests/mp01/node1/Makefile.am
index a83e0a403b..6a81f8727e 100644
--- a/testsuites/mptests/mp01/node1/Makefile.am
+++ b/testsuites/mptests/mp01/node1/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp
rtems_tests_PROGRAMS = mp01-node1.exe
mp01_node1_exe_SOURCES = ../init.c ../task1.c ../system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp01-node1.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp01-node1.doc
+dist_rtems_tests_DATA = mp01-node1.scn
+dist_rtems_tests_DATA += mp01-node1.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp01/node2/Makefile.am b/testsuites/mptests/mp01/node2/Makefile.am
index 97a7ab1c5a..a078a2a2a8 100644
--- a/testsuites/mptests/mp01/node2/Makefile.am
+++ b/testsuites/mptests/mp01/node2/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp
rtems_tests_PROGRAMS = mp01-node2.exe
mp01_node2_exe_SOURCES = ../init.c ../task1.c ../system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp01-node2.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp01-node2.doc
+dist_rtems_tests_DATA = mp01-node2.scn
+dist_rtems_tests_DATA += mp01-node2.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp02/node1/Makefile.am b/testsuites/mptests/mp02/node1/Makefile.am
index 4fa7487c71..4ccfbfd501 100644
--- a/testsuites/mptests/mp02/node1/Makefile.am
+++ b/testsuites/mptests/mp02/node1/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp
rtems_tests_PROGRAMS = mp02-node1.exe
mp02_node1_exe_SOURCES = ../init.c ../task1.c ../system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp02-node1.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp02-node1.doc
+dist_rtems_tests_DATA = mp02-node1.scn
+dist_rtems_tests_DATA += mp02-node1.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp02/node2/Makefile.am b/testsuites/mptests/mp02/node2/Makefile.am
index b61821f4e2..2e0fcf231c 100644
--- a/testsuites/mptests/mp02/node2/Makefile.am
+++ b/testsuites/mptests/mp02/node2/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp
rtems_tests_PROGRAMS = mp02-node2.exe
mp02_node2_exe_SOURCES = ../init.c ../task1.c ../system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp02-node2.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp02-node2.doc
+dist_rtems_tests_DATA = mp02-node2.scn
+dist_rtems_tests_DATA += mp02-node2.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp03/node1/Makefile.am b/testsuites/mptests/mp03/node1/Makefile.am
index 39112a24b4..333caef403 100644
--- a/testsuites/mptests/mp03/node1/Makefile.am
+++ b/testsuites/mptests/mp03/node1/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp timer event
rtems_tests_PROGRAMS = mp03-node1.exe
mp03_node1_exe_SOURCES = ../init.c ../task1.c ../delay.c ../system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp03-node1.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp03-node1.doc
+dist_rtems_tests_DATA = mp03-node1.scn
+dist_rtems_tests_DATA += mp03-node1.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp03/node2/Makefile.am b/testsuites/mptests/mp03/node2/Makefile.am
index d21fe15db5..f49c7b46c7 100644
--- a/testsuites/mptests/mp03/node2/Makefile.am
+++ b/testsuites/mptests/mp03/node2/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp timer event
rtems_tests_PROGRAMS = mp03-node2.exe
mp03_node2_exe_SOURCES = ../init.c ../delay.c ../task1.c ../system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp03-node2.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp03-node2.doc
+dist_rtems_tests_DATA = mp03-node2.scn
+dist_rtems_tests_DATA += mp03-node2.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp04/node1/Makefile.am b/testsuites/mptests/mp04/node1/Makefile.am
index b38fd3b99e..f9bd3db92b 100644
--- a/testsuites/mptests/mp04/node1/Makefile.am
+++ b/testsuites/mptests/mp04/node1/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp
rtems_tests_PROGRAMS = mp04-node1.exe
mp04_node1_exe_SOURCES = ../init.c ../task1.c ../system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp04-node1.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp04-node1.doc
+dist_rtems_tests_DATA = mp04-node1.scn
+dist_rtems_tests_DATA += mp04-node1.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp04/node2/Makefile.am b/testsuites/mptests/mp04/node2/Makefile.am
index 21f1f0c5cb..c6424d4b78 100644
--- a/testsuites/mptests/mp04/node2/Makefile.am
+++ b/testsuites/mptests/mp04/node2/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp
rtems_tests_PROGRAMS = mp04-node2.exe
mp04_node2_exe_SOURCES = ../init.c ../task1.c ../system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp04-node2.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp04-node2.doc
+dist_rtems_tests_DATA = mp04-node2.scn
+dist_rtems_tests_DATA += mp04-node2.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp05/node1/Makefile.am b/testsuites/mptests/mp05/node1/Makefile.am
index 931b8cda0a..39e2170af0 100644
--- a/testsuites/mptests/mp05/node1/Makefile.am
+++ b/testsuites/mptests/mp05/node1/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp signal timer
rtems_tests_PROGRAMS = mp05-node1.exe
mp05_node1_exe_SOURCES = ../init.c ../asr.c ../task1.c ../system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp05-node1.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp05-node1.doc
+dist_rtems_tests_DATA = mp05-node1.scn
+dist_rtems_tests_DATA += mp05-node1.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp05/node2/Makefile.am b/testsuites/mptests/mp05/node2/Makefile.am
index cbcc359268..690b7af478 100644
--- a/testsuites/mptests/mp05/node2/Makefile.am
+++ b/testsuites/mptests/mp05/node2/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp signal timer
rtems_tests_PROGRAMS = mp05-node2.exe
mp05_node2_exe_SOURCES = ../init.c ../asr.c ../task1.c ../system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp05-node2.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp05-node2.doc
+dist_rtems_tests_DATA = mp05-node2.scn
+dist_rtems_tests_DATA += mp05-node2.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp06/node1/Makefile.am b/testsuites/mptests/mp06/node1/Makefile.am
index a81821cf10..91fff7f456 100644
--- a/testsuites/mptests/mp06/node1/Makefile.am
+++ b/testsuites/mptests/mp06/node1/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp event timer
rtems_tests_PROGRAMS = mp06-node1.exe
mp06_node1_exe_SOURCES = ../init.c ../task1.c ../system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp06-node1.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp06-node1.doc
+dist_rtems_tests_DATA = mp06-node1.scn
+dist_rtems_tests_DATA += mp06-node1.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp06/node2/Makefile.am b/testsuites/mptests/mp06/node2/Makefile.am
index 9899489a58..705e9f8e31 100644
--- a/testsuites/mptests/mp06/node2/Makefile.am
+++ b/testsuites/mptests/mp06/node2/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp event timer
rtems_tests_PROGRAMS = mp06-node2.exe
mp06_node2_exe_SOURCES = ../init.c ../task1.c ../system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp06-node2.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp06-node2.doc
+dist_rtems_tests_DATA = mp06-node2.scn
+dist_rtems_tests_DATA += mp06-node2.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp07/node1/Makefile.am b/testsuites/mptests/mp07/node1/Makefile.am
index 07579d9368..c6dad99aa8 100644
--- a/testsuites/mptests/mp07/node1/Makefile.am
+++ b/testsuites/mptests/mp07/node1/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp event timer
rtems_tests_PROGRAMS = mp07-node1.exe
mp07_node1_exe_SOURCES = ../init.c ../task1.c ../system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp07-node1.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp07-node1.doc
+dist_rtems_tests_DATA = mp07-node1.scn
+dist_rtems_tests_DATA += mp07-node1.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp07/node2/Makefile.am b/testsuites/mptests/mp07/node2/Makefile.am
index e8232b874c..500f0f55bd 100644
--- a/testsuites/mptests/mp07/node2/Makefile.am
+++ b/testsuites/mptests/mp07/node2/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp event timer
rtems_tests_PROGRAMS = mp07-node2.exe
mp07_node2_exe_SOURCES = ../init.c ../task1.c ../system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp07-node2.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp07-node2.doc
+dist_rtems_tests_DATA = mp07-node2.scn
+dist_rtems_tests_DATA += mp07-node2.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp08/node1/Makefile.am b/testsuites/mptests/mp08/node1/Makefile.am
index f778d67b45..471b446fb2 100644
--- a/testsuites/mptests/mp08/node1/Makefile.am
+++ b/testsuites/mptests/mp08/node1/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp semaphore
rtems_tests_PROGRAMS = mp08-node1.exe
mp08_node1_exe_SOURCES = ../init.c ../task1.c ../system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp08-node1.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp08-node1.doc
+dist_rtems_tests_DATA = mp08-node1.scn
+dist_rtems_tests_DATA += mp08-node1.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp08/node2/Makefile.am b/testsuites/mptests/mp08/node2/Makefile.am
index 641b27ff8c..cd06712f89 100644
--- a/testsuites/mptests/mp08/node2/Makefile.am
+++ b/testsuites/mptests/mp08/node2/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp semaphore
rtems_tests_PROGRAMS = mp08-node2.exe
mp08_node2_exe_SOURCES = ../init.c ../task1.c ../system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp08-node2.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp08-node2.doc
+dist_rtems_tests_DATA = mp08-node2.scn
+dist_rtems_tests_DATA += mp08-node2.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp09/node1/Makefile.am b/testsuites/mptests/mp09/node1/Makefile.am
index 4094154d95..19261173ac 100644
--- a/testsuites/mptests/mp09/node1/Makefile.am
+++ b/testsuites/mptests/mp09/node1/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp message
rtems_tests_PROGRAMS = mp09-node1.exe
mp09_node1_exe_SOURCES = ../init.c ../task1.c ../recvmsg.c ../sendmsg.c ../system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp09-node1.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp09-node1.doc
+dist_rtems_tests_DATA = mp09-node1.scn
+dist_rtems_tests_DATA += mp09-node1.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp09/node2/Makefile.am b/testsuites/mptests/mp09/node2/Makefile.am
index add1aabfbf..470ff5fe08 100644
--- a/testsuites/mptests/mp09/node2/Makefile.am
+++ b/testsuites/mptests/mp09/node2/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp message
rtems_tests_PROGRAMS = mp09-node2.exe
mp09_node2_exe_SOURCES = ../init.c ../task1.c ../recvmsg.c ../sendmsg.c ../system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp09-node2.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp09-node2.doc
+dist_rtems_tests_DATA = mp09-node2.scn
+dist_rtems_tests_DATA += mp09-node2.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp10/node1/Makefile.am b/testsuites/mptests/mp10/node1/Makefile.am
index c44f5dcc8e..8d130450ab 100644
--- a/testsuites/mptests/mp10/node1/Makefile.am
+++ b/testsuites/mptests/mp10/node1/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp message semaphore
rtems_tests_PROGRAMS = mp10-node1.exe
mp10_node1_exe_SOURCES = ../init.c ../task1.c ../task2.c ../task3.c ../system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp10-node1.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp10-node1.doc
+dist_rtems_tests_DATA = mp10-node1.scn
+dist_rtems_tests_DATA += mp10-node1.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp10/node2/Makefile.am b/testsuites/mptests/mp10/node2/Makefile.am
index 7577d92692..eb44d36d58 100644
--- a/testsuites/mptests/mp10/node2/Makefile.am
+++ b/testsuites/mptests/mp10/node2/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp message semaphore
rtems_tests_PROGRAMS = mp10-node2.exe
mp10_node2_exe_SOURCES = ../init.c ../task1.c ../task2.c ../task3.c ../system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp10-node2.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp10-node2.doc
+dist_rtems_tests_DATA = mp10-node2.scn
+dist_rtems_tests_DATA += mp10-node2.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp11/node1/Makefile.am b/testsuites/mptests/mp11/node1/Makefile.am
index c596d33ac2..26530853c0 100644
--- a/testsuites/mptests/mp11/node1/Makefile.am
+++ b/testsuites/mptests/mp11/node1/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp message partition semaphore
rtems_tests_PROGRAMS = mp11-node1.exe
mp11_node1_exe_SOURCES = ../init.c ../system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp11-node1.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp11-node1.doc
+dist_rtems_tests_DATA = mp11-node1.scn
+dist_rtems_tests_DATA += mp11-node1.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp11/node2/Makefile.am b/testsuites/mptests/mp11/node2/Makefile.am
index 56e0082b7f..b60c553dd6 100644
--- a/testsuites/mptests/mp11/node2/Makefile.am
+++ b/testsuites/mptests/mp11/node2/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp message partition semaphore
rtems_tests_PROGRAMS = mp11-node2.exe
mp11_node2_exe_SOURCES = ../init.c ../system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp11-node2.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp11-node2.doc
+dist_rtems_tests_DATA = mp11-node2.scn
+dist_rtems_tests_DATA += mp11-node2.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp12/node1/Makefile.am b/testsuites/mptests/mp12/node1/Makefile.am
index e5a8cd0272..8e3c237568 100644
--- a/testsuites/mptests/mp12/node1/Makefile.am
+++ b/testsuites/mptests/mp12/node1/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp partition
rtems_tests_PROGRAMS = mp12-node1.exe
mp12_node1_exe_SOURCES = ../init.c ../system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp12-node1.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp12-node1.doc
+dist_rtems_tests_DATA = mp12-node1.scn
+dist_rtems_tests_DATA += mp12-node1.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp12/node2/Makefile.am b/testsuites/mptests/mp12/node2/Makefile.am
index 67005171c1..8ba5b382ad 100644
--- a/testsuites/mptests/mp12/node2/Makefile.am
+++ b/testsuites/mptests/mp12/node2/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp partition
rtems_tests_PROGRAMS = mp12-node2.exe
mp12_node2_exe_SOURCES = ../init.c ../system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp12-node2.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp12-node2.doc
+dist_rtems_tests_DATA = mp12-node2.scn
+dist_rtems_tests_DATA += mp12-node2.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp13/node1/Makefile.am b/testsuites/mptests/mp13/node1/Makefile.am
index b3b96b58d3..b223970813 100644
--- a/testsuites/mptests/mp13/node1/Makefile.am
+++ b/testsuites/mptests/mp13/node1/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp message semaphore
rtems_tests_PROGRAMS = mp13-node1.exe
mp13_node1_exe_SOURCES = ../init.c ../task1.c ../task2.c ../system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp13-node1.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp13-node1.doc
+dist_rtems_tests_DATA = mp13-node1.scn
+dist_rtems_tests_DATA += mp13-node1.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp13/node2/Makefile.am b/testsuites/mptests/mp13/node2/Makefile.am
index e285e8f666..4cc9e083c1 100644
--- a/testsuites/mptests/mp13/node2/Makefile.am
+++ b/testsuites/mptests/mp13/node2/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io mp message semaphore
rtems_tests_PROGRAMS = mp13-node2.exe
mp13_node2_exe_SOURCES = ../init.c ../task1.c ../task2.c ../system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp13-node2.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp13-node2.doc
+dist_rtems_tests_DATA = mp13-node2.scn
+dist_rtems_tests_DATA += mp13-node2.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp14/node1/Makefile.am b/testsuites/mptests/mp14/node1/Makefile.am
index 29c06bf210..e2e1ff6511 100644
--- a/testsuites/mptests/mp14/node1/Makefile.am
+++ b/testsuites/mptests/mp14/node1/Makefile.am
@@ -8,10 +8,8 @@ rtems_tests_PROGRAMS = mp14-node1.exe
mp14_node1_exe_SOURCES = ../exit.c ../init.c ../delay.c ../evtask1.c ../evtmtask.c \
../pttask1.c ../smtask1.c ../msgtask1.c ../system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp14-node1.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp14-node1.doc
+dist_rtems_tests_DATA = mp14-node1.scn
+dist_rtems_tests_DATA += mp14-node1.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/mptests/mp14/node2/Makefile.am b/testsuites/mptests/mp14/node2/Makefile.am
index 5a4ce979da..936f59042f 100644
--- a/testsuites/mptests/mp14/node2/Makefile.am
+++ b/testsuites/mptests/mp14/node2/Makefile.am
@@ -8,10 +8,8 @@ rtems_tests_PROGRAMS = mp14-node2.exe
mp14_node2_exe_SOURCES = ../exit.c ../init.c ../delay.c ../evtask1.c ../evtmtask.c \
../pttask1.c ../smtask1.c ../msgtask1.c ../system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = mp14-node2.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = mp14-node2.doc
+dist_rtems_tests_DATA = mp14-node2.scn
+dist_rtems_tests_DATA += mp14-node2.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/sptests/sp01/Makefile.am b/testsuites/sptests/sp01/Makefile.am
index b735f45b2f..ed65d93d14 100644
--- a/testsuites/sptests/sp01/Makefile.am
+++ b/testsuites/sptests/sp01/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io
rtems_tests_PROGRAMS = sp01.exe
sp01_exe_SOURCES = init.c task1.c system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = sp01.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = sp01.doc
+dist_rtems_tests_DATA = sp01.scn
+dist_rtems_tests_DATA += sp01.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/sptests/sp02/Makefile.am b/testsuites/sptests/sp02/Makefile.am
index 0cf09caef0..5adf71f630 100644
--- a/testsuites/sptests/sp02/Makefile.am
+++ b/testsuites/sptests/sp02/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io
rtems_tests_PROGRAMS = sp02.exe
sp02_exe_SOURCES = init.c task1.c task2.c task3.c preempt.c system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = sp02.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = sp02.doc
+dist_rtems_tests_DATA = sp02.scn
+dist_rtems_tests_DATA += sp02.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/sptests/sp03/Makefile.am b/testsuites/sptests/sp03/Makefile.am
index 62915583fe..2d5150c75f 100644
--- a/testsuites/sptests/sp03/Makefile.am
+++ b/testsuites/sptests/sp03/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io
rtems_tests_PROGRAMS = sp03.exe
sp03_exe_SOURCES = init.c task1.c task2.c system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = sp03.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = sp03.doc
+dist_rtems_tests_DATA = sp03.scn
+dist_rtems_tests_DATA += sp03.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/sptests/sp04/Makefile.am b/testsuites/sptests/sp04/Makefile.am
index bfe0a8ce95..a82d08fa52 100644
--- a/testsuites/sptests/sp04/Makefile.am
+++ b/testsuites/sptests/sp04/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io
rtems_tests_PROGRAMS = sp04.exe
sp04_exe_SOURCES = init.c task1.c task2.c task3.c tswitch.c system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = sp04.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = sp04.doc
+dist_rtems_tests_DATA = sp04.scn
+dist_rtems_tests_DATA += sp04.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/sptests/sp05/Makefile.am b/testsuites/sptests/sp05/Makefile.am
index b31d95cd73..6d9f55b8c7 100644
--- a/testsuites/sptests/sp05/Makefile.am
+++ b/testsuites/sptests/sp05/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io
rtems_tests_PROGRAMS = sp05.exe
sp05_exe_SOURCES = init.c task1.c task2.c task3.c system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = sp05.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = sp05.doc
+dist_rtems_tests_DATA = sp05.scn
+dist_rtems_tests_DATA += sp05.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/sptests/sp06/Makefile.am b/testsuites/sptests/sp06/Makefile.am
index 1b4a45fe34..4f3955300d 100644
--- a/testsuites/sptests/sp06/Makefile.am
+++ b/testsuites/sptests/sp06/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io
rtems_tests_PROGRAMS = sp06.exe
sp06_exe_SOURCES = init.c task1.c task2.c task3.c system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = sp06.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = sp06.doc
+dist_rtems_tests_DATA = sp06.scn
+dist_rtems_tests_DATA += sp06.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/sptests/sp07/Makefile.am b/testsuites/sptests/sp07/Makefile.am
index 0d95bd1826..183d56fbc6 100644
--- a/testsuites/sptests/sp07/Makefile.am
+++ b/testsuites/sptests/sp07/Makefile.am
@@ -8,10 +8,8 @@ rtems_tests_PROGRAMS = sp07.exe
sp07_exe_SOURCES = init.c buffered_io.c task1.c task2.c task3.c task4.c taskexit.c \
tcreate.c tdelete.c trestart.c tstart.c system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = sp07.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = sp07.doc
+dist_rtems_tests_DATA = sp07.scn
+dist_rtems_tests_DATA += sp07.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/sptests/sp08/Makefile.am b/testsuites/sptests/sp08/Makefile.am
index 6929b27906..dd47285747 100644
--- a/testsuites/sptests/sp08/Makefile.am
+++ b/testsuites/sptests/sp08/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io
rtems_tests_PROGRAMS = sp08.exe
sp08_exe_SOURCES = init.c task1.c system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = sp08.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = sp08.doc
+dist_rtems_tests_DATA = sp08.scn
+dist_rtems_tests_DATA += sp08.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/sptests/sp09/Makefile.am b/testsuites/sptests/sp09/Makefile.am
index 993010dc5d..0539730576 100644
--- a/testsuites/sptests/sp09/Makefile.am
+++ b/testsuites/sptests/sp09/Makefile.am
@@ -11,10 +11,8 @@ sp09_exe_SOURCES = init.c delay.c isr.c screen01.c screen02.c screen03.c screen0
screen11.c screen12.c screen13.c screen14.c task1.c task2.c task3.c \
task4.c system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = sp09.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = sp09.doc
+dist_rtems_tests_DATA = sp09.scn
+dist_rtems_tests_DATA += sp09.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/sptests/sp11/Makefile.am b/testsuites/sptests/sp11/Makefile.am
index 28b327733c..ead97a9b6c 100644
--- a/testsuites/sptests/sp11/Makefile.am
+++ b/testsuites/sptests/sp11/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io event timer
rtems_tests_PROGRAMS = sp11.exe
sp11_exe_SOURCES = init.c task1.c task2.c timer.c system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = sp11.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = sp11.doc
+dist_rtems_tests_DATA = sp11.scn
+dist_rtems_tests_DATA += sp11.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/sptests/sp12/Makefile.am b/testsuites/sptests/sp12/Makefile.am
index d96e7642c1..a2a45dc687 100644
--- a/testsuites/sptests/sp12/Makefile.am
+++ b/testsuites/sptests/sp12/Makefile.am
@@ -8,10 +8,8 @@ rtems_tests_PROGRAMS = sp12.exe
sp12_exe_SOURCES = init.c task1.c task2.c task3.c task4.c task5.c pridrv.c \
pritask.c system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = sp12.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = sp12.doc
+dist_rtems_tests_DATA = sp12.scn
+dist_rtems_tests_DATA += sp12.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/sptests/sp13/Makefile.am b/testsuites/sptests/sp13/Makefile.am
index 9fd37227d1..c034aab5e2 100644
--- a/testsuites/sptests/sp13/Makefile.am
+++ b/testsuites/sptests/sp13/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io message
rtems_tests_PROGRAMS = sp13.exe
sp13_exe_SOURCES = init.c fillbuff.c putbuff.c task1.c task2.c task3.c system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = sp13.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = sp13.doc
+dist_rtems_tests_DATA = sp13.scn
+dist_rtems_tests_DATA += sp13.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/sptests/sp14/Makefile.am b/testsuites/sptests/sp14/Makefile.am
index f01e5cad7c..141242ad4f 100644
--- a/testsuites/sptests/sp14/Makefile.am
+++ b/testsuites/sptests/sp14/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io signal timer
rtems_tests_PROGRAMS = sp14.exe
sp14_exe_SOURCES = init.c asr.c task1.c task2.c system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = sp14.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = sp14.doc
+dist_rtems_tests_DATA = sp14.scn
+dist_rtems_tests_DATA += sp14.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/sptests/sp15/Makefile.am b/testsuites/sptests/sp15/Makefile.am
index 16fd78d107..1eadbc09ce 100644
--- a/testsuites/sptests/sp15/Makefile.am
+++ b/testsuites/sptests/sp15/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io partition
rtems_tests_PROGRAMS = sp15.exe
sp15_exe_SOURCES = init.c task1.c system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = sp15.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = sp15.doc
+dist_rtems_tests_DATA = sp15.scn
+dist_rtems_tests_DATA += sp15.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/sptests/sp16/Makefile.am b/testsuites/sptests/sp16/Makefile.am
index 96519482f8..a1a4556e96 100644
--- a/testsuites/sptests/sp16/Makefile.am
+++ b/testsuites/sptests/sp16/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io region
rtems_tests_PROGRAMS = sp16.exe
sp16_exe_SOURCES = init.c task1.c task2.c task3.c task4.c task5.c system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = sp16.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = sp16.doc
+dist_rtems_tests_DATA = sp16.scn
+dist_rtems_tests_DATA += sp16.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/sptests/sp17/Makefile.am b/testsuites/sptests/sp17/Makefile.am
index e72b4a5602..1064820e1e 100644
--- a/testsuites/sptests/sp17/Makefile.am
+++ b/testsuites/sptests/sp17/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io signal
rtems_tests_PROGRAMS = sp17.exe
sp17_exe_SOURCES = init.c asr.c task1.c task2.c system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = sp17.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = sp17.doc
+dist_rtems_tests_DATA = sp17.scn
+dist_rtems_tests_DATA += sp17.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/sptests/sp19/Makefile.am b/testsuites/sptests/sp19/Makefile.am
index 833b33d51c..8ac0079b47 100644
--- a/testsuites/sptests/sp19/Makefile.am
+++ b/testsuites/sptests/sp19/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io
rtems_tests_PROGRAMS = sp19.exe
sp19_exe_SOURCES = init.c first.c fptask.c task1.c system.h fptest.h inttest.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = sp19.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = sp19.doc
+dist_rtems_tests_DATA = sp19.scn
+dist_rtems_tests_DATA += sp19.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/sptests/sp20/Makefile.am b/testsuites/sptests/sp20/Makefile.am
index 01c147ed20..5be5a1cb60 100644
--- a/testsuites/sptests/sp20/Makefile.am
+++ b/testsuites/sptests/sp20/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io rate_monotonic
rtems_tests_PROGRAMS = sp20.exe
sp20_exe_SOURCES = init.c getall.c task1.c system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = sp20.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = sp20.doc
+dist_rtems_tests_DATA = sp20.scn
+dist_rtems_tests_DATA += sp20.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/sptests/sp21/Makefile.am b/testsuites/sptests/sp21/Makefile.am
index 2e6cb01696..9f91cf7d1f 100644
--- a/testsuites/sptests/sp21/Makefile.am
+++ b/testsuites/sptests/sp21/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io
rtems_tests_PROGRAMS = sp21.exe
sp21_exe_SOURCES = init.c task1.c system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = sp21.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = sp21.doc
+dist_rtems_tests_DATA = sp21.scn
+dist_rtems_tests_DATA += sp21.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/sptests/sp22/Makefile.am b/testsuites/sptests/sp22/Makefile.am
index cf218619b8..8b1200027e 100644
--- a/testsuites/sptests/sp22/Makefile.am
+++ b/testsuites/sptests/sp22/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io timer
rtems_tests_PROGRAMS = sp22.exe
sp22_exe_SOURCES = init.c prtime.c delay.c task1.c system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = sp22.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = sp22.doc
+dist_rtems_tests_DATA = sp22.scn
+dist_rtems_tests_DATA += sp22.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/sptests/sp23/Makefile.am b/testsuites/sptests/sp23/Makefile.am
index d8012e09d0..9d1a4a9e89 100644
--- a/testsuites/sptests/sp23/Makefile.am
+++ b/testsuites/sptests/sp23/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io dual_ported_memory
rtems_tests_PROGRAMS = sp23.exe
sp23_exe_SOURCES = init.c task1.c system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = sp23.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = sp23.doc
+dist_rtems_tests_DATA = sp23.scn
+dist_rtems_tests_DATA += sp23.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/sptests/sp24/Makefile.am b/testsuites/sptests/sp24/Makefile.am
index 4ccea0919e..6390e37e6d 100644
--- a/testsuites/sptests/sp24/Makefile.am
+++ b/testsuites/sptests/sp24/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io event timer
rtems_tests_PROGRAMS = sp24.exe
sp24_exe_SOURCES = init.c resume.c task1.c system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = sp24.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = sp24.doc
+dist_rtems_tests_DATA = sp24.scn
+dist_rtems_tests_DATA += sp24.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/sptests/sp25/Makefile.am b/testsuites/sptests/sp25/Makefile.am
index fd585764fd..d2b31e5201 100644
--- a/testsuites/sptests/sp25/Makefile.am
+++ b/testsuites/sptests/sp25/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io region
rtems_tests_PROGRAMS = sp25.exe
sp25_exe_SOURCES = init.c task1.c system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = sp25.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = sp25.doc
+dist_rtems_tests_DATA = sp25.scn
+dist_rtems_tests_DATA += sp25.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/sptests/sp26/Makefile.am b/testsuites/sptests/sp26/Makefile.am
index 214eaf6200..d67305184b 100644
--- a/testsuites/sptests/sp26/Makefile.am
+++ b/testsuites/sptests/sp26/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io region event
rtems_tests_PROGRAMS = sp26.exe
sp26_exe_SOURCES = init.c task1.c system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = sp26.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = sp26.doc
+dist_rtems_tests_DATA = sp26.scn
+dist_rtems_tests_DATA += sp26.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/sptests/sp27/Makefile.am b/testsuites/sptests/sp27/Makefile.am
index 9c3851390f..bd706176b6 100644
--- a/testsuites/sptests/sp27/Makefile.am
+++ b/testsuites/sptests/sp27/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = all
rtems_tests_PROGRAMS = sp27.exe
sp27_exe_SOURCES = init.c
-scndir = $(rtems_testsdir)
-dist_scn_DATA = sp27.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = sp27.doc
+dist_rtems_tests_DATA = sp27.scn
+dist_rtems_tests_DATA += sp27.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/sptests/sp28/Makefile.am b/testsuites/sptests/sp28/Makefile.am
index 63c2fb3276..a57f54c082 100644
--- a/testsuites/sptests/sp28/Makefile.am
+++ b/testsuites/sptests/sp28/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = all
rtems_tests_PROGRAMS = sp28.exe
sp28_exe_SOURCES = init.c
-scndir = $(rtems_testsdir)
-dist_scn_DATA = sp28.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = sp28.doc
+dist_rtems_tests_DATA = sp28.scn
+dist_rtems_tests_DATA += sp28.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/sptests/sp29/Makefile.am b/testsuites/sptests/sp29/Makefile.am
index 245178a2b8..51f7ee5fbe 100644
--- a/testsuites/sptests/sp29/Makefile.am
+++ b/testsuites/sptests/sp29/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = all
rtems_tests_PROGRAMS = sp29.exe
sp29_exe_SOURCES = init.c
-scndir = $(rtems_testsdir)
-dist_scn_DATA = sp29.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = sp29.doc
+dist_rtems_tests_DATA = sp29.scn
+dist_rtems_tests_DATA += sp29.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/sptests/sp30/Makefile.am b/testsuites/sptests/sp30/Makefile.am
index dfbcda75d0..28831d00f1 100644
--- a/testsuites/sptests/sp30/Makefile.am
+++ b/testsuites/sptests/sp30/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = all
rtems_tests_PROGRAMS = sp30.exe
sp30_exe_SOURCES = init.c resume.c task1.c system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = sp30.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = sp30.doc
+dist_rtems_tests_DATA = sp30.scn
+dist_rtems_tests_DATA += sp30.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/sptests/sp31/Makefile.am b/testsuites/sptests/sp31/Makefile.am
index 8e9afbcbf9..a01e116fcb 100644
--- a/testsuites/sptests/sp31/Makefile.am
+++ b/testsuites/sptests/sp31/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = all
rtems_tests_PROGRAMS = sp31.exe
sp31_exe_SOURCES = delay.c init.c prtime.c task1.c system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = sp31.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = sp31.doc
+dist_rtems_tests_DATA = sp31.scn
+dist_rtems_tests_DATA += sp31.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/sptests/sp32/Makefile.am b/testsuites/sptests/sp32/Makefile.am
index b1747ef617..b57ce120e6 100644
--- a/testsuites/sptests/sp32/Makefile.am
+++ b/testsuites/sptests/sp32/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = io rate_monotonic
rtems_tests_PROGRAMS = sp32.exe
sp32_exe_SOURCES = init.c
-scndir = $(rtems_testsdir)
-dist_scn_DATA = sp32.scn
+dist_rtems_tests_DATA = sp32.scn
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/sptests/spfatal/Makefile.am b/testsuites/sptests/spfatal/Makefile.am
index 24c4484934..2171902e58 100644
--- a/testsuites/sptests/spfatal/Makefile.am
+++ b/testsuites/sptests/spfatal/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = io
rtems_tests_PROGRAMS = spfatal.exe
spfatal_exe_SOURCES = init.c puterr.c fatal.c task1.c system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = spfatal.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = spfatal.doc
+dist_rtems_tests_DATA = spfatal.scn
+dist_rtems_tests_DATA += spfatal.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/sptests/spsize/Makefile.am b/testsuites/sptests/spsize/Makefile.am
index ee23b78383..a004726e48 100644
--- a/testsuites/sptests/spsize/Makefile.am
+++ b/testsuites/sptests/spsize/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = io
rtems_tests_PROGRAMS = spsize.exe
spsize_exe_SOURCES = init.c getint.c size.c system.h
-scndir = $(rtems_testsdir)
-dist_scn_DATA = spsize.scn
+dist_rtems_tests_DATA = spsize.scn
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/tmitrontests/tmitronsem01/Makefile.am b/testsuites/tmitrontests/tmitronsem01/Makefile.am
index 97305e4dff..c2113aed20 100644
--- a/testsuites/tmitrontests/tmitronsem01/Makefile.am
+++ b/testsuites/tmitrontests/tmitronsem01/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = all
rtems_tests_PROGRAMS = tmitronsem01.exe
tmitronsem01_exe_SOURCES = init.c system.h
-docdir = $(rtems_testsdir)
-dist_doc_DATA = tmitronsem01.doc
+dist_rtems_tests_DATA = tmitronsem01.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/tmtests/tm01/Makefile.am b/testsuites/tmtests/tm01/Makefile.am
index 7685c91e94..0fddee6877 100644
--- a/testsuites/tmtests/tm01/Makefile.am
+++ b/testsuites/tmtests/tm01/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = io semaphore
rtems_tests_PROGRAMS = tm01.exe
tm01_exe_SOURCES = task1.c system.h ../include/timesys.h
-docdir = $(rtems_testsdir)
-dist_doc_DATA = tm01.doc
+dist_rtems_tests_DATA = tm01.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/tmtests/tm02/Makefile.am b/testsuites/tmtests/tm02/Makefile.am
index 4dc3e056b5..c9c0b5e403 100644
--- a/testsuites/tmtests/tm02/Makefile.am
+++ b/testsuites/tmtests/tm02/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = io semaphore
rtems_tests_PROGRAMS = tm02.exe
tm02_exe_SOURCES = task1.c system.h ../include/timesys.h
-docdir = $(rtems_testsdir)
-dist_doc_DATA = tm02.doc
+dist_rtems_tests_DATA = tm02.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/tmtests/tm03/Makefile.am b/testsuites/tmtests/tm03/Makefile.am
index 5a51dd0ee0..659123cacc 100644
--- a/testsuites/tmtests/tm03/Makefile.am
+++ b/testsuites/tmtests/tm03/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = io semaphore
rtems_tests_PROGRAMS = tm03.exe
tm03_exe_SOURCES = task1.c system.h ../include/timesys.h
-docdir = $(rtems_testsdir)
-dist_doc_DATA = tm03.doc
+dist_rtems_tests_DATA = tm03.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/tmtests/tm04/Makefile.am b/testsuites/tmtests/tm04/Makefile.am
index 0152e1fc28..5f57e4e4c2 100644
--- a/testsuites/tmtests/tm04/Makefile.am
+++ b/testsuites/tmtests/tm04/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = io semaphore
rtems_tests_PROGRAMS = tm04.exe
tm04_exe_SOURCES = task1.c system.h ../include/timesys.h
-docdir = $(rtems_testsdir)
-dist_doc_DATA = tm04.doc
+dist_rtems_tests_DATA = tm04.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/tmtests/tm05/Makefile.am b/testsuites/tmtests/tm05/Makefile.am
index eedb7b1f00..71ec40f58f 100644
--- a/testsuites/tmtests/tm05/Makefile.am
+++ b/testsuites/tmtests/tm05/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = io
rtems_tests_PROGRAMS = tm05.exe
tm05_exe_SOURCES = task1.c system.h ../include/timesys.h
-docdir = $(rtems_testsdir)
-dist_doc_DATA = tm05.doc
+dist_rtems_tests_DATA = tm05.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/tmtests/tm06/Makefile.am b/testsuites/tmtests/tm06/Makefile.am
index 5105c42239..fe71883b5f 100644
--- a/testsuites/tmtests/tm06/Makefile.am
+++ b/testsuites/tmtests/tm06/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = io
rtems_tests_PROGRAMS = tm06.exe
tm06_exe_SOURCES = task1.c system.h ../include/timesys.h
-docdir = $(rtems_testsdir)
-dist_doc_DATA = tm06.doc
+dist_rtems_tests_DATA = tm06.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/tmtests/tm07/Makefile.am b/testsuites/tmtests/tm07/Makefile.am
index 79cc5e4363..c2bf16d71b 100644
--- a/testsuites/tmtests/tm07/Makefile.am
+++ b/testsuites/tmtests/tm07/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = io
rtems_tests_PROGRAMS = tm07.exe
tm07_exe_SOURCES = task1.c system.h ../include/timesys.h
-docdir = $(rtems_testsdir)
-dist_doc_DATA = tm07.doc
+dist_rtems_tests_DATA = tm07.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/tmtests/tm08/Makefile.am b/testsuites/tmtests/tm08/Makefile.am
index 70d7a2ba95..9a6443337f 100644
--- a/testsuites/tmtests/tm08/Makefile.am
+++ b/testsuites/tmtests/tm08/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = io
rtems_tests_PROGRAMS = tm08.exe
tm08_exe_SOURCES = task1.c system.h ../include/timesys.h
-docdir = $(rtems_testsdir)
-dist_doc_DATA = tm08.doc
+dist_rtems_tests_DATA = tm08.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/tmtests/tm09/Makefile.am b/testsuites/tmtests/tm09/Makefile.am
index 6306633562..734ff687e2 100644
--- a/testsuites/tmtests/tm09/Makefile.am
+++ b/testsuites/tmtests/tm09/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = io message
rtems_tests_PROGRAMS = tm09.exe
tm09_exe_SOURCES = task1.c system.h ../include/timesys.h
-docdir = $(rtems_testsdir)
-dist_doc_DATA = tm09.doc
+dist_rtems_tests_DATA = tm09.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/tmtests/tm10/Makefile.am b/testsuites/tmtests/tm10/Makefile.am
index 017e9c74f9..05f70a9f7e 100644
--- a/testsuites/tmtests/tm10/Makefile.am
+++ b/testsuites/tmtests/tm10/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = io message
rtems_tests_PROGRAMS = tm10.exe
tm10_exe_SOURCES = task1.c system.h ../include/timesys.h
-docdir = $(rtems_testsdir)
-dist_doc_DATA = tm10.doc
+dist_rtems_tests_DATA = tm10.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/tmtests/tm11/Makefile.am b/testsuites/tmtests/tm11/Makefile.am
index 0fe5eaf588..9712428b11 100644
--- a/testsuites/tmtests/tm11/Makefile.am
+++ b/testsuites/tmtests/tm11/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = io message
rtems_tests_PROGRAMS = tm11.exe
tm11_exe_SOURCES = task1.c system.h ../include/timesys.h
-docdir = $(rtems_testsdir)
-dist_doc_DATA = tm11.doc
+dist_rtems_tests_DATA = tm11.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/tmtests/tm12/Makefile.am b/testsuites/tmtests/tm12/Makefile.am
index 8508fa0be4..3f1f05e66c 100644
--- a/testsuites/tmtests/tm12/Makefile.am
+++ b/testsuites/tmtests/tm12/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = io message
rtems_tests_PROGRAMS = tm12.exe
tm12_exe_SOURCES = task1.c system.h ../include/timesys.h
-docdir = $(rtems_testsdir)
-dist_doc_DATA = tm12.doc
+dist_rtems_tests_DATA = tm12.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/tmtests/tm13/Makefile.am b/testsuites/tmtests/tm13/Makefile.am
index 4eaf1e864b..3cbe7c02bd 100644
--- a/testsuites/tmtests/tm13/Makefile.am
+++ b/testsuites/tmtests/tm13/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = io message
rtems_tests_PROGRAMS = tm13.exe
tm13_exe_SOURCES = task1.c system.h ../include/timesys.h
-docdir = $(rtems_testsdir)
-dist_doc_DATA = tm13.doc
+dist_rtems_tests_DATA = tm13.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/tmtests/tm14/Makefile.am b/testsuites/tmtests/tm14/Makefile.am
index 49053e0b0d..dba2a8937a 100644
--- a/testsuites/tmtests/tm14/Makefile.am
+++ b/testsuites/tmtests/tm14/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = io message
rtems_tests_PROGRAMS = tm14.exe
tm14_exe_SOURCES = task1.c system.h ../include/timesys.h
-docdir = $(rtems_testsdir)
-dist_doc_DATA = tm14.doc
+dist_rtems_tests_DATA = tm14.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/tmtests/tm15/Makefile.am b/testsuites/tmtests/tm15/Makefile.am
index 019f95f40d..97d473b7dc 100644
--- a/testsuites/tmtests/tm15/Makefile.am
+++ b/testsuites/tmtests/tm15/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = io event
rtems_tests_PROGRAMS = tm15.exe
tm15_exe_SOURCES = task1.c system.h ../include/timesys.h
-docdir = $(rtems_testsdir)
-dist_doc_DATA = tm15.doc
+dist_rtems_tests_DATA = tm15.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/tmtests/tm16/Makefile.am b/testsuites/tmtests/tm16/Makefile.am
index 1c35923cf8..74881d97e9 100644
--- a/testsuites/tmtests/tm16/Makefile.am
+++ b/testsuites/tmtests/tm16/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = io event
rtems_tests_PROGRAMS = tm16.exe
tm16_exe_SOURCES = task1.c system.h ../include/timesys.h
-docdir = $(rtems_testsdir)
-dist_doc_DATA = tm16.doc
+dist_rtems_tests_DATA = tm16.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/tmtests/tm17/Makefile.am b/testsuites/tmtests/tm17/Makefile.am
index 465ebfc3d0..a274a66206 100644
--- a/testsuites/tmtests/tm17/Makefile.am
+++ b/testsuites/tmtests/tm17/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = io
rtems_tests_PROGRAMS = tm17.exe
tm17_exe_SOURCES = task1.c system.h ../include/timesys.h
-docdir = $(rtems_testsdir)
-dist_doc_DATA = tm17.doc
+dist_rtems_tests_DATA = tm17.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/tmtests/tm18/Makefile.am b/testsuites/tmtests/tm18/Makefile.am
index 9fb7eb635b..920cf59c1b 100644
--- a/testsuites/tmtests/tm18/Makefile.am
+++ b/testsuites/tmtests/tm18/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = io
rtems_tests_PROGRAMS = tm18.exe
tm18_exe_SOURCES = task1.c system.h ../include/timesys.h
-docdir = $(rtems_testsdir)
-dist_doc_DATA = tm18.doc
+dist_rtems_tests_DATA = tm18.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/tmtests/tm19/Makefile.am b/testsuites/tmtests/tm19/Makefile.am
index 9561d992f0..3ecab507d7 100644
--- a/testsuites/tmtests/tm19/Makefile.am
+++ b/testsuites/tmtests/tm19/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = io signal
rtems_tests_PROGRAMS = tm19.exe
tm19_exe_SOURCES = task1.c system.h ../include/timesys.h
-docdir = $(rtems_testsdir)
-dist_doc_DATA = tm19.doc
+dist_rtems_tests_DATA = tm19.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/tmtests/tm20/Makefile.am b/testsuites/tmtests/tm20/Makefile.am
index c3386f29f7..d042b0a12b 100644
--- a/testsuites/tmtests/tm20/Makefile.am
+++ b/testsuites/tmtests/tm20/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = io partition region
rtems_tests_PROGRAMS = tm20.exe
tm20_exe_SOURCES = task1.c system.h ../include/timesys.h
-docdir = $(rtems_testsdir)
-dist_doc_DATA = tm20.doc
+dist_rtems_tests_DATA = tm20.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/tmtests/tm21/Makefile.am b/testsuites/tmtests/tm21/Makefile.am
index c5a50e9542..3e42fb2877 100644
--- a/testsuites/tmtests/tm21/Makefile.am
+++ b/testsuites/tmtests/tm21/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = io dpmem message partition region semaphore rate_monotonic timer
rtems_tests_PROGRAMS = tm21.exe
tm21_exe_SOURCES = task1.c system.h ../include/timesys.h
-docdir = $(rtems_testsdir)
-dist_doc_DATA = tm21.doc
+dist_rtems_tests_DATA = tm21.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/tmtests/tm22/Makefile.am b/testsuites/tmtests/tm22/Makefile.am
index c288bbe5fc..14d70e8f72 100644
--- a/testsuites/tmtests/tm22/Makefile.am
+++ b/testsuites/tmtests/tm22/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = io message
rtems_tests_PROGRAMS = tm22.exe
tm22_exe_SOURCES = task1.c system.h ../include/timesys.h
-docdir = $(rtems_testsdir)
-dist_doc_DATA = tm22.doc
+dist_rtems_tests_DATA = tm22.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/tmtests/tm23/Makefile.am b/testsuites/tmtests/tm23/Makefile.am
index 61150e395b..8c14bb0225 100644
--- a/testsuites/tmtests/tm23/Makefile.am
+++ b/testsuites/tmtests/tm23/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = io event timer
rtems_tests_PROGRAMS = tm23.exe
tm23_exe_SOURCES = task1.c system.h ../include/timesys.h
-docdir = $(rtems_testsdir)
-dist_doc_DATA = tm23.doc
+dist_rtems_tests_DATA = tm23.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/tmtests/tm24/Makefile.am b/testsuites/tmtests/tm24/Makefile.am
index 7c7847792b..0a49a5b360 100644
--- a/testsuites/tmtests/tm24/Makefile.am
+++ b/testsuites/tmtests/tm24/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = io message
rtems_tests_PROGRAMS = tm24.exe
tm24_exe_SOURCES = task1.c system.h ../include/timesys.h
-docdir = $(rtems_testsdir)
-dist_doc_DATA = tm24.doc
+dist_rtems_tests_DATA = tm24.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/tmtests/tm25/Makefile.am b/testsuites/tmtests/tm25/Makefile.am
index c4c66acadd..237d317251 100644
--- a/testsuites/tmtests/tm25/Makefile.am
+++ b/testsuites/tmtests/tm25/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = io semaphore
rtems_tests_PROGRAMS = tm25.exe
tm25_exe_SOURCES = task1.c system.h ../include/timesys.h
-docdir = $(rtems_testsdir)
-dist_doc_DATA = tm25.doc
+dist_rtems_tests_DATA = tm25.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/tmtests/tm26/Makefile.am b/testsuites/tmtests/tm26/Makefile.am
index a72d62bd22..a586d76659 100644
--- a/testsuites/tmtests/tm26/Makefile.am
+++ b/testsuites/tmtests/tm26/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = io semaphore
rtems_tests_PROGRAMS = tm26.exe
tm26_exe_SOURCES = task1.c system.h fptest.h ../include/timesys.h ../include/timesys.h
-docdir = $(rtems_testsdir)
-dist_doc_DATA = tm26.doc
+dist_rtems_tests_DATA = tm26.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/tmtests/tm27/Makefile.am b/testsuites/tmtests/tm27/Makefile.am
index 02fcbd0a63..edc8f102fc 100644
--- a/testsuites/tmtests/tm27/Makefile.am
+++ b/testsuites/tmtests/tm27/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = io
rtems_tests_PROGRAMS = tm27.exe
tm27_exe_SOURCES = task1.c system.h ../include/timesys.h
-docdir = $(rtems_testsdir)
-dist_doc_DATA = tm27.doc
+dist_rtems_tests_DATA = tm27.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/tmtests/tm28/Makefile.am b/testsuites/tmtests/tm28/Makefile.am
index bbcd87b21f..a4c6ac8fab 100644
--- a/testsuites/tmtests/tm28/Makefile.am
+++ b/testsuites/tmtests/tm28/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = io dpmem
rtems_tests_PROGRAMS = tm28.exe
tm28_exe_SOURCES = task1.c system.h ../include/timesys.h
-docdir = $(rtems_testsdir)
-dist_doc_DATA = tm28.doc
+dist_rtems_tests_DATA = tm28.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/tmtests/tm29/Makefile.am b/testsuites/tmtests/tm29/Makefile.am
index 1431a528b1..2c2a883e1a 100644
--- a/testsuites/tmtests/tm29/Makefile.am
+++ b/testsuites/tmtests/tm29/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = io rate_monotonic
rtems_tests_PROGRAMS = tm29.exe
tm29_exe_SOURCES = task1.c system.h ../include/timesys.h
-docdir = $(rtems_testsdir)
-dist_doc_DATA = tm29.doc
+dist_rtems_tests_DATA = tm29.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/tmtests/tmck/Makefile.am b/testsuites/tmtests/tmck/Makefile.am
index cf1ede17ec..d326b697de 100644
--- a/testsuites/tmtests/tmck/Makefile.am
+++ b/testsuites/tmtests/tmck/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = io
rtems_tests_PROGRAMS = tmck.exe
tmck_exe_SOURCES = task1.c system.h ../include/timesys.h
-docdir = $(rtems_testsdir)
-dist_doc_DATA = tmck.doc
+dist_rtems_tests_DATA = tmck.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
diff --git a/testsuites/tmtests/tmoverhd/Makefile.am b/testsuites/tmtests/tmoverhd/Makefile.am
index 6387280bbe..6c330d8a05 100644
--- a/testsuites/tmtests/tmoverhd/Makefile.am
+++ b/testsuites/tmtests/tmoverhd/Makefile.am
@@ -7,8 +7,7 @@ MANAGERS = io
rtems_tests_PROGRAMS = tmoverhd.exe
tmoverhd_exe_SOURCES = testtask.c empty.c system.h dumrtems.h ../include/timesys.h
-docdir = $(rtems_testsdir)
-dist_doc_DATA = tmoverhd.doc
+dist_rtems_tests_DATA = tmoverhd.doc
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am