2008-02-01 Joel Sherrill <joel.sherrill@oarcorp.com>

	* mptests/mp01/node1/Makefile.am, mptests/mp01/node2/Makefile.am,
	mptests/mp02/node1/Makefile.am, mptests/mp02/node2/Makefile.am,
	mptests/mp03/node1/Makefile.am, mptests/mp03/node2/Makefile.am,
	mptests/mp04/node1/Makefile.am, mptests/mp04/node2/Makefile.am,
	mptests/mp05/node1/Makefile.am, mptests/mp05/node2/Makefile.am,
	mptests/mp06/node1/Makefile.am, mptests/mp06/node2/Makefile.am,
	mptests/mp07/node1/Makefile.am, mptests/mp07/node2/Makefile.am,
	mptests/mp08/node1/Makefile.am, mptests/mp08/node2/Makefile.am,
	mptests/mp09/node1/Makefile.am, mptests/mp09/node2/Makefile.am,
	mptests/mp10/node1/Makefile.am, mptests/mp10/node2/Makefile.am,
	mptests/mp11/node1/Makefile.am, mptests/mp11/node2/Makefile.am,
	mptests/mp12/node1/Makefile.am, mptests/mp12/node2/Makefile.am,
	mptests/mp13/node1/Makefile.am, mptests/mp13/node2/Makefile.am,
	mptests/mp14/node1/Makefile.am, mptests/mp14/node2/Makefile.am,
	samples/base_mp/node1/Makefile.am, samples/base_mp/node2/Makefile.am,
	samples/base_sp/Makefile.am, samples/hello/Makefile.am,
	samples/nsecs/Makefile.am, samples/ticker/Makefile.am,
	sptests/sp01/Makefile.am, sptests/sp02/Makefile.am,
	sptests/sp03/Makefile.am, sptests/sp04/Makefile.am,
	sptests/sp05/Makefile.am, sptests/sp06/Makefile.am,
	sptests/sp07/Makefile.am, sptests/sp08/Makefile.am,
	sptests/sp09/Makefile.am, sptests/sp11/Makefile.am,
	sptests/sp12/Makefile.am, sptests/sp13/Makefile.am,
	sptests/sp14/Makefile.am, sptests/sp15/Makefile.am,
	sptests/sp16/Makefile.am, sptests/sp17/Makefile.am,
	sptests/sp19/Makefile.am, sptests/sp20/Makefile.am,
	sptests/sp22/Makefile.am, sptests/sp23/Makefile.am,
	sptests/sp24/Makefile.am, sptests/sp25/Makefile.am,
	tmtests/tm01/Makefile.am, tmtests/tm02/Makefile.am,
	tmtests/tm03/Makefile.am, tmtests/tm04/Makefile.am,
	tmtests/tm05/Makefile.am, tmtests/tm06/Makefile.am,
	tmtests/tm07/Makefile.am, tmtests/tm08/Makefile.am,
	tmtests/tm09/Makefile.am, tmtests/tm10/Makefile.am,
	tmtests/tm11/Makefile.am, tmtests/tm12/Makefile.am,
	tmtests/tm13/Makefile.am, tmtests/tm14/Makefile.am,
	tmtests/tm15/Makefile.am, tmtests/tm16/Makefile.am,
	tmtests/tm17/Makefile.am, tmtests/tm18/Makefile.am,
	tmtests/tm19/Makefile.am, tmtests/tm20/Makefile.am,
	tmtests/tm21/Makefile.am, tmtests/tm22/Makefile.am,
	tmtests/tm23/Makefile.am, tmtests/tm24/Makefile.am,
	tmtests/tm25/Makefile.am, tmtests/tm28/Makefile.am,
	tmtests/tm29/Makefile.am, tmtests/tmck/Makefile.am,
	tmtests/tmoverhd/Makefile.am: Make all test names unique. All needed
	ada_ as prefix to distinguish them from the C tests. MP tests should
	produce an executable with test name and node number in it. Screens
	renamed to follow.
	* ada_mvscn, mptests/mp01/node1/ada_mp01-node1.scn,
	mptests/mp01/node2/ada_mp01-node2.scn,
	mptests/mp02/node1/ada_mp02-node1.scn,
	mptests/mp02/node2/ada_mp02-node2.scn,
	mptests/mp03/node1/ada_mp03-node1.scn,
	mptests/mp03/node2/ada_mp03-node2.scn,
	mptests/mp04/node1/ada_mp04-node1.scn,
	mptests/mp04/node2/ada_mp04-node2.scn,
	mptests/mp05/node1/ada_mp05-node1.scn,
	mptests/mp05/node2/ada_mp05-node2.scn,
	mptests/mp06/node1/ada_mp06-node1.scn,
	mptests/mp06/node2/ada_mp06-node2.scn,
	mptests/mp07/node1/ada_mp07-node1.scn,
	mptests/mp07/node2/ada_mp07-node2.scn,
	mptests/mp08/node1/ada_mp08-node1.scn,
	mptests/mp08/node2/ada_mp08-node2.scn,
	mptests/mp09/node1/ada_mp09-node1.scn,
	mptests/mp09/node2/ada_mp09-node2.scn,
	mptests/mp10/node1/ada_mp10-node1.scn,
	mptests/mp10/node2/ada_mp10-node2.scn,
	mptests/mp11/node1/ada_mp11-node1.scn,
	mptests/mp11/node2/ada_mp11-node2.scn,
	mptests/mp12/node1/ada_mp12-node1.scn,
	mptests/mp12/node2/ada_mp12-node2.scn,
	mptests/mp13/node1/ada_mp13-node1.scn,
	mptests/mp13/node2/ada_mp13-node2.scn,
	mptests/mp14/node1/ada_mp14-node1.scn,
	mptests/mp14/node2/ada_mp14-node2.scn,
	samples/base_mp/node1/ada_base_mp-node1.scn,
	samples/base_mp/node2/ada_base_mp-node2.scn,
	samples/base_sp/ada_base_sp.scn, samples/hello/ada_hello.scn,
	samples/nsecs/ada_nsecs.scn, samples/ticker/ada_ticker.scn,
	sptests/sp01/ada_sp01.scn, sptests/sp02/ada_sp02.scn,
	sptests/sp03/ada_sp03.scn, sptests/sp04/ada_sp04.scn,
	sptests/sp05/ada_sp05.scn, sptests/sp06/ada_sp06.scn,
	sptests/sp07/ada_sp07.scn, sptests/sp08/ada_sp08.scn,
	sptests/sp09/ada_sp09.scn, sptests/sp11/ada_sp11.scn,
	sptests/sp12/ada_sp12.scn, sptests/sp13/ada_sp13.scn,
	sptests/sp14/ada_sp14.scn, sptests/sp15/ada_sp15.scn,
	sptests/sp16/ada_sp16.scn, sptests/sp17/ada_sp17.scn,
	sptests/sp19/ada_sp19.scn, sptests/sp20/ada_sp20.scn,
	sptests/sp22/ada_sp22.scn, sptests/sp23/ada_sp23.scn,
	sptests/sp24/ada_sp24.scn, sptests/sp25/ada_sp25.scn: New files.
	* mptests/mp01/node1/mp01-node1.scn, mptests/mp01/node2/mp01-node2.scn,
	mptests/mp02/node1/mp02-node1.scn, mptests/mp02/node2/mp02-node2.scn,
	mptests/mp03/node1/mp03-node1.scn, mptests/mp03/node2/mp03-node2.scn,
	mptests/mp04/node1/mp04-node1.scn, mptests/mp04/node2/mp04-node2.scn,
	mptests/mp05/node1/mp05-node1.scn, mptests/mp05/node2/mp05-node2.scn,
	mptests/mp06/node1/mp06-node1.scn, mptests/mp06/node2/mp06-node2.scn,
	mptests/mp07/node1/mp07-node1.scn, mptests/mp07/node2/mp07-node2.scn,
	mptests/mp08/node1/mp08-node1.scn, mptests/mp08/node2/mp08-node2.scn,
	mptests/mp09/node1/mp09-node1.scn, mptests/mp09/node2/mp09-node2.scn,
	mptests/mp10/node1/mp10-node1.scn, mptests/mp10/node2/mp10-node2.scn,
	mptests/mp11/node1/mp11-node1.scn, mptests/mp11/node2/mp11-node2.scn,
	mptests/mp12/node1/mp12-node1.scn, mptests/mp12/node2/mp12-node2.scn,
	mptests/mp13/node1/mp13-node1.scn, mptests/mp13/node2/mp13-node2.scn,
	mptests/mp14/node1/mp14-node1.scn, mptests/mp14/node2/mp14-node2.scn,
	samples/base_mp/node1/base_mp-node1.scn,
	samples/base_mp/node2/base_mp-node2.scn, samples/base_sp/base_sp.scn,
	samples/hello/hello.scn, samples/nsecs/nsecs.scn,
	samples/ticker/ticker.scn, sptests/sp01/sp01.scn,
	sptests/sp02/sp02.scn, sptests/sp03/sp03.scn, sptests/sp04/sp04.scn,
	sptests/sp05/sp05.scn, sptests/sp06/sp06.scn, sptests/sp07/sp07.scn,
	sptests/sp08/sp08.scn, sptests/sp09/sp09.scn, sptests/sp11/sp11.scn,
	sptests/sp12/sp12.scn, sptests/sp13/sp13.scn, sptests/sp14/sp14.scn,
	sptests/sp15/sp15.scn, sptests/sp16/sp16.scn, sptests/sp17/sp17.scn,
	sptests/sp19/sp19.scn, sptests/sp20/sp20.scn, sptests/sp22/sp22.scn,
	sptests/sp23/sp23.scn, sptests/sp24/sp24.scn, sptests/sp25/sp25.scn:
	Removed.

12 files changed, 23 insertions, 23 deletions

diff --git a/c/src/ada-tests/samples/base_mp/node1/Makefile.am b/c/src/ada-tests/samples/base_mp/node1/Makefile.am
index 8f49755f9d..1b09523a7e 100644
--- a/c/src/ada-tests/samples/base_mp/node1/Makefile.am
+++ b/c/src/ada-tests/samples/base_mp/node1/Makefile.am
@@ -7,17 +7,17 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-node1.exe: ../mptest.adb init.o
+ada_base_mp_node1.exe: ../mptest.adb init.o
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 init.o: ../../../support/init.c
 	$(COMPILE.c) -DNODE_NUMBER=1 -I$(srcdir)/.. -c $<
 
 if EXPADA
-noinst_PROGRAMS = node1.exe
+noinst_PROGRAMS = ada_base_mp_node1.exe
 endif
 
 scndir = $(rtems_ada_testsdir)
-dist_scn_DATA = base_mp-node1.scn
+dist_scn_DATA = ada_base_mp-node1.scn
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/samples/base_mp/node1/base_mp-node1.scn b/c/src/ada-tests/samples/base_mp/node1/ada_base_mp-node1.scn
index a2d2f359be..a2d2f359be 100644
--- a/c/src/ada-tests/samples/base_mp/node1/base_mp-node1.scn
+++ b/c/src/ada-tests/samples/base_mp/node1/ada_base_mp-node1.scn
diff --git a/c/src/ada-tests/samples/base_mp/node2/Makefile.am b/c/src/ada-tests/samples/base_mp/node2/Makefile.am
index 8fde3a6c44..f870f6dabd 100644
--- a/c/src/ada-tests/samples/base_mp/node2/Makefile.am
+++ b/c/src/ada-tests/samples/base_mp/node2/Makefile.am
@@ -7,19 +7,19 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-node2.exe: ../mptest.adb init.o
+ada_base_mp_node2.exe: ../mptest.adb init.o
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 init.o: ../../../support/init.c
 	$(COMPILE.c) -DNODE_NUMBER=2 -I$(srcdir)/.. -c $<
 
 if EXPADA
-noinst_PROGRAMS = node2.exe
+noinst_PROGRAMS = ada_base_mp_node2.exe
 endif
 
-node2_exe_SOURCES = mptest-per_node_configuration.adb
+ada_base_mp_node2_exe_SOURCES = mptest-per_node_configuration.adb
 
 scndir = $(rtems_ada_testsdir)
-dist_scn_DATA = base_mp-node2.scn
+dist_scn_DATA = ada_base_mp-node2.scn
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/samples/base_mp/node2/base_mp-node2.scn b/c/src/ada-tests/samples/base_mp/node2/ada_base_mp-node2.scn
index 95bc96a808..95bc96a808 100644
--- a/c/src/ada-tests/samples/base_mp/node2/base_mp-node2.scn
+++ b/c/src/ada-tests/samples/base_mp/node2/ada_base_mp-node2.scn
diff --git a/c/src/ada-tests/samples/base_sp/Makefile.am b/c/src/ada-tests/samples/base_sp/Makefile.am
index b44e5fd3bf..5a7830eea4 100644
--- a/c/src/ada-tests/samples/base_sp/Makefile.am
+++ b/c/src/ada-tests/samples/base_sp/Makefile.am
@@ -5,17 +5,17 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-base_sp.exe: base_sp.adb init.$(OBJEXT)
+ada_base_sp.exe: base_sp.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 init.$(OBJEXT): ../../support/init.c
 	$(COMPILE.c) -I$(srcdir) -c $<
 
-noinst_PROGRAMS = base_sp.exe
+noinst_PROGRAMS = ada_base_sp.exe
 
-base_sp_exe_SOURCES = base_sp.adb config.h sptest.adb sptest.ads
+ada_base_sp_exe_SOURCES = base_sp.adb config.h sptest.adb sptest.ads
 
 scndir = $(rtems_ada_testsdir)
-dist_scn_DATA = base_sp.scn
+dist_scn_DATA = ada_base_sp.scn
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/samples/base_sp/base_sp.scn b/c/src/ada-tests/samples/base_sp/ada_base_sp.scn
index 7b8867dc85..7b8867dc85 100644
--- a/c/src/ada-tests/samples/base_sp/base_sp.scn
+++ b/c/src/ada-tests/samples/base_sp/ada_base_sp.scn
diff --git a/c/src/ada-tests/samples/hello/Makefile.am b/c/src/ada-tests/samples/hello/Makefile.am
index 9ed52dd6b3..9334448973 100644
--- a/c/src/ada-tests/samples/hello/Makefile.am
+++ b/c/src/ada-tests/samples/hello/Makefile.am
@@ -5,17 +5,17 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-hello.exe: hello.adb init.$(OBJEXT)
+ada_hello.exe: hello.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 init.$(OBJEXT): ../../support/init.c
 	$(COMPILE.c) -I$(srcdir) -c $<
 
-noinst_PROGRAMS = hello.exe
+noinst_PROGRAMS = ada_hello.exe
 
-hello_exe_SOURCES = hello.adb config.h sptest.adb sptest.ads
+ada_hello_exe_SOURCES = hello.adb config.h sptest.adb sptest.ads
 
 scndir = $(rtems_ada_testsdir)
-dist_scn_DATA = hello.scn
+dist_scn_DATA = ada_hello.scn
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/samples/hello/hello.scn b/c/src/ada-tests/samples/hello/ada_hello.scn
index d9e92d81d5..d9e92d81d5 100644
--- a/c/src/ada-tests/samples/hello/hello.scn
+++ b/c/src/ada-tests/samples/hello/ada_hello.scn
diff --git a/c/src/ada-tests/samples/nsecs/Makefile.am b/c/src/ada-tests/samples/nsecs/Makefile.am
index 0462ffdea8..ff1e8d31eb 100644
--- a/c/src/ada-tests/samples/nsecs/Makefile.am
+++ b/c/src/ada-tests/samples/nsecs/Makefile.am
@@ -5,17 +5,17 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-nsecs.exe: nsecs.adb init.$(OBJEXT)
+ada_nsecs.exe: nsecs.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 init.$(OBJEXT): ../../support/init.c
 	$(COMPILE.c) -I$(srcdir) -c $<
 
-noinst_PROGRAMS = nsecs.exe
+noinst_PROGRAMS = ada_nsecs.exe
 
-nsecs_exe_SOURCES = nsecs.adb config.h sptest.adb sptest.ads
+ada_nsecs_exe_SOURCES = nsecs.adb config.h sptest.adb sptest.ads
 
 scndir = $(rtems_ada_testsdir)
-dist_scn_DATA = nsecs.scn
+dist_scn_DATA = ada_nsecs.scn
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/samples/nsecs/nsecs.scn b/c/src/ada-tests/samples/nsecs/ada_nsecs.scn
index 458f12c874..458f12c874 100644
--- a/c/src/ada-tests/samples/nsecs/nsecs.scn
+++ b/c/src/ada-tests/samples/nsecs/ada_nsecs.scn
diff --git a/c/src/ada-tests/samples/ticker/Makefile.am b/c/src/ada-tests/samples/ticker/Makefile.am
index 2b026dc99f..ca9af4c853 100644
--- a/c/src/ada-tests/samples/ticker/Makefile.am
+++ b/c/src/ada-tests/samples/ticker/Makefile.am
@@ -5,17 +5,17 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-ticker.exe: ticker.adb init.$(OBJEXT)
+ada_ticker.exe: ticker.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 init.$(OBJEXT): ../../support/init.c
 	$(COMPILE.c) -I$(srcdir) -c $<
 
-noinst_PROGRAMS = ticker.exe
+noinst_PROGRAMS = ada_ticker.exe
 
-ticker_exe_SOURCES = ticker.adb config.h sptest.adb sptest.ads
+ada_ticker_exe_SOURCES = ticker.adb config.h sptest.adb sptest.ads
 
 scndir = $(rtems_ada_testsdir)
-dist_scn_DATA = ticker.scn
+dist_scn_DATA = ada_ticker.scn
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/samples/ticker/ticker.scn b/c/src/ada-tests/samples/ticker/ada_ticker.scn
index 89cd8b3204..89cd8b3204 100644
--- a/c/src/ada-tests/samples/ticker/ticker.scn
+++ b/c/src/ada-tests/samples/ticker/ada_ticker.scn