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/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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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