Eliminate scndir, docdir. Use rtems_testsdir instead.

2006-07-11 05:09:12 +00:00
parent 7066061e3f
commit 9c5ea1114a
92 changed files with 150 additions and 300 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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