ada-tests: Move to testsuites/ada

This solves a build dependency issue, e.g. building tests before
librtemsbsp.a exists.

Close #3079.

33 files changed, 17 insertions, 17 deletions

diff --git a/c/src/ada-tests/samples/Makefile.am b/testsuites/ada/samples/Makefile.am
index c41a4b4af8..0aa25affad 100644
--- a/c/src/ada-tests/samples/Makefile.am
+++ b/testsuites/ada/samples/Makefile.am
@@ -5,5 +5,5 @@ _SUBDIRS += base_mp
 endif
 DIST_SUBDIRS = hello ticker base_sp base_mp nsecs
 
-include $(top_srcdir)/../../../testsuites/automake/subdirs.am
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/subdirs.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/samples/base_mp/Makefile.am b/testsuites/ada/samples/base_mp/Makefile.am
index caf05e5fb0..ed05ebbd72 100644
--- a/c/src/ada-tests/samples/base_mp/Makefile.am
+++ b/testsuites/ada/samples/base_mp/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 _SUBDIRS = node1 node2
 #include $(top_srcdir)/ada.am
@@ -17,5 +17,5 @@ _SUBDIRS = node1 node2
 
 #EXTRA_DIST += node2/mptest-per_node_configuration.adb
 
-include $(top_srcdir)/../../../testsuites/automake/subdirs.am
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/subdirs.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/samples/base_mp/config.h b/testsuites/ada/samples/base_mp/config.h
index 33c9288f4c..33c9288f4c 100644
--- a/c/src/ada-tests/samples/base_mp/config.h
+++ b/testsuites/ada/samples/base_mp/config.h
diff --git a/c/src/ada-tests/samples/base_mp/mptest.adb b/testsuites/ada/samples/base_mp/mptest.adb
index d4eef0a29f..d4eef0a29f 100644
--- a/c/src/ada-tests/samples/base_mp/mptest.adb
+++ b/testsuites/ada/samples/base_mp/mptest.adb
diff --git a/c/src/ada-tests/samples/base_mp/mptest.ads b/testsuites/ada/samples/base_mp/mptest.ads
index f246b4e0ed..f246b4e0ed 100644
--- a/c/src/ada-tests/samples/base_mp/mptest.ads
+++ b/testsuites/ada/samples/base_mp/mptest.ads
diff --git a/c/src/ada-tests/samples/base_mp/node1/Makefile.am b/testsuites/ada/samples/base_mp/node1/Makefile.am
index 530766541c..c6ec8cd42b 100644
--- a/c/src/ada-tests/samples/base_mp/node1/Makefile.am
+++ b/testsuites/ada/samples/base_mp/node1/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -19,4 +19,4 @@ init.o: ../../../support/init.c
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_base_mp-node1.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/samples/base_mp/node1/ada_base_mp-node1.scn b/testsuites/ada/samples/base_mp/node1/ada_base_mp-node1.scn
index a2d2f359be..a2d2f359be 100644
--- a/c/src/ada-tests/samples/base_mp/node1/ada_base_mp-node1.scn
+++ b/testsuites/ada/samples/base_mp/node1/ada_base_mp-node1.scn
diff --git a/c/src/ada-tests/samples/base_mp/node2/Makefile.am b/testsuites/ada/samples/base_mp/node2/Makefile.am
index efc208bf65..9095902a0b 100644
--- a/c/src/ada-tests/samples/base_mp/node2/Makefile.am
+++ b/testsuites/ada/samples/base_mp/node2/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -19,4 +19,4 @@ init.o: ../../../support/init.c
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_base_mp-node2.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/samples/base_mp/node2/ada_base_mp-node2.scn b/testsuites/ada/samples/base_mp/node2/ada_base_mp-node2.scn
index 95bc96a808..95bc96a808 100644
--- a/c/src/ada-tests/samples/base_mp/node2/ada_base_mp-node2.scn
+++ b/testsuites/ada/samples/base_mp/node2/ada_base_mp-node2.scn
diff --git a/c/src/ada-tests/samples/base_sp/Makefile.am b/testsuites/ada/samples/base_sp/Makefile.am
index 6575f06ccc..c6b2628735 100644
--- a/c/src/ada-tests/samples/base_sp/Makefile.am
+++ b/testsuites/ada/samples/base_sp/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ ada_base_sp_SOURCES = base_sp.adb config.h sptest.adb sptest.ads
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_base_sp.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/samples/base_sp/ada_base_sp.scn b/testsuites/ada/samples/base_sp/ada_base_sp.scn
index 7b8867dc85..7b8867dc85 100644
--- a/c/src/ada-tests/samples/base_sp/ada_base_sp.scn
+++ b/testsuites/ada/samples/base_sp/ada_base_sp.scn
diff --git a/c/src/ada-tests/samples/base_sp/base_sp.adb b/testsuites/ada/samples/base_sp/base_sp.adb
index aaa1ab3bca..aaa1ab3bca 100644
--- a/c/src/ada-tests/samples/base_sp/base_sp.adb
+++ b/testsuites/ada/samples/base_sp/base_sp.adb
diff --git a/c/src/ada-tests/samples/base_sp/config.h b/testsuites/ada/samples/base_sp/config.h
index 083d52515e..083d52515e 100644
--- a/c/src/ada-tests/samples/base_sp/config.h
+++ b/testsuites/ada/samples/base_sp/config.h
diff --git a/c/src/ada-tests/samples/base_sp/sptest.adb b/testsuites/ada/samples/base_sp/sptest.adb
index 85a847f281..85a847f281 100644
--- a/c/src/ada-tests/samples/base_sp/sptest.adb
+++ b/testsuites/ada/samples/base_sp/sptest.adb
diff --git a/c/src/ada-tests/samples/base_sp/sptest.ads b/testsuites/ada/samples/base_sp/sptest.ads
index e35751cd32..e35751cd32 100644
--- a/c/src/ada-tests/samples/base_sp/sptest.ads
+++ b/testsuites/ada/samples/base_sp/sptest.ads
diff --git a/c/src/ada-tests/samples/hello/Makefile.am b/testsuites/ada/samples/hello/Makefile.am
index ff4b51c232..9a6aa5eeb6 100644
--- a/c/src/ada-tests/samples/hello/Makefile.am
+++ b/testsuites/ada/samples/hello/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ ada_hello_SOURCES = hello.adb config.h sptest.adb sptest.ads
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_hello.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/samples/hello/ada_hello.scn b/testsuites/ada/samples/hello/ada_hello.scn
index d9e92d81d5..d9e92d81d5 100644
--- a/c/src/ada-tests/samples/hello/ada_hello.scn
+++ b/testsuites/ada/samples/hello/ada_hello.scn
diff --git a/c/src/ada-tests/samples/hello/config.h b/testsuites/ada/samples/hello/config.h
index 2be186cc2a..2be186cc2a 100644
--- a/c/src/ada-tests/samples/hello/config.h
+++ b/testsuites/ada/samples/hello/config.h
diff --git a/c/src/ada-tests/samples/hello/hello.adb b/testsuites/ada/samples/hello/hello.adb
index f7748f3607..f7748f3607 100644
--- a/c/src/ada-tests/samples/hello/hello.adb
+++ b/testsuites/ada/samples/hello/hello.adb
diff --git a/c/src/ada-tests/samples/hello/sptest.adb b/testsuites/ada/samples/hello/sptest.adb
index 8c29155eba..8c29155eba 100644
--- a/c/src/ada-tests/samples/hello/sptest.adb
+++ b/testsuites/ada/samples/hello/sptest.adb
diff --git a/c/src/ada-tests/samples/hello/sptest.ads b/testsuites/ada/samples/hello/sptest.ads
index 62993b0220..62993b0220 100644
--- a/c/src/ada-tests/samples/hello/sptest.ads
+++ b/testsuites/ada/samples/hello/sptest.ads
diff --git a/c/src/ada-tests/samples/nsecs/Makefile.am b/testsuites/ada/samples/nsecs/Makefile.am
index bc8dd2a87b..64a8145818 100644
--- a/c/src/ada-tests/samples/nsecs/Makefile.am
+++ b/testsuites/ada/samples/nsecs/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ ada_nsecs_SOURCES = nsecs.adb config.h sptest.adb sptest.ads
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_nsecs.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/samples/nsecs/ada_nsecs.scn b/testsuites/ada/samples/nsecs/ada_nsecs.scn
index 458f12c874..458f12c874 100644
--- a/c/src/ada-tests/samples/nsecs/ada_nsecs.scn
+++ b/testsuites/ada/samples/nsecs/ada_nsecs.scn
diff --git a/c/src/ada-tests/samples/nsecs/config.h b/testsuites/ada/samples/nsecs/config.h
index 7703e721f0..7703e721f0 100644
--- a/c/src/ada-tests/samples/nsecs/config.h
+++ b/testsuites/ada/samples/nsecs/config.h
diff --git a/c/src/ada-tests/samples/nsecs/nsecs.adb b/testsuites/ada/samples/nsecs/nsecs.adb
index 0a8f84a606..0a8f84a606 100644
--- a/c/src/ada-tests/samples/nsecs/nsecs.adb
+++ b/testsuites/ada/samples/nsecs/nsecs.adb
diff --git a/c/src/ada-tests/samples/nsecs/sptest.adb b/testsuites/ada/samples/nsecs/sptest.adb
index 193fa09a45..193fa09a45 100644
--- a/c/src/ada-tests/samples/nsecs/sptest.adb
+++ b/testsuites/ada/samples/nsecs/sptest.adb
diff --git a/c/src/ada-tests/samples/nsecs/sptest.ads b/testsuites/ada/samples/nsecs/sptest.ads
index 97fa00ac2c..97fa00ac2c 100644
--- a/c/src/ada-tests/samples/nsecs/sptest.ads
+++ b/testsuites/ada/samples/nsecs/sptest.ads
diff --git a/c/src/ada-tests/samples/ticker/Makefile.am b/testsuites/ada/samples/ticker/Makefile.am
index b21d6c464f..12594586b3 100644
--- a/c/src/ada-tests/samples/ticker/Makefile.am
+++ b/testsuites/ada/samples/ticker/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ ada_ticker_SOURCES = ticker.adb config.h sptest.adb sptest.ads
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_ticker.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/samples/ticker/ada_ticker.scn b/testsuites/ada/samples/ticker/ada_ticker.scn
index 89cd8b3204..89cd8b3204 100644
--- a/c/src/ada-tests/samples/ticker/ada_ticker.scn
+++ b/testsuites/ada/samples/ticker/ada_ticker.scn
diff --git a/c/src/ada-tests/samples/ticker/config.h b/testsuites/ada/samples/ticker/config.h
index 17d957c94a..17d957c94a 100644
--- a/c/src/ada-tests/samples/ticker/config.h
+++ b/testsuites/ada/samples/ticker/config.h
diff --git a/c/src/ada-tests/samples/ticker/sptest.adb b/testsuites/ada/samples/ticker/sptest.adb
index 2de8b35b79..2de8b35b79 100644
--- a/c/src/ada-tests/samples/ticker/sptest.adb
+++ b/testsuites/ada/samples/ticker/sptest.adb
diff --git a/c/src/ada-tests/samples/ticker/sptest.ads b/testsuites/ada/samples/ticker/sptest.ads
index 8753d3edad..8753d3edad 100644
--- a/c/src/ada-tests/samples/ticker/sptest.ads
+++ b/testsuites/ada/samples/ticker/sptest.ads
diff --git a/c/src/ada-tests/samples/ticker/ticker.adb b/testsuites/ada/samples/ticker/ticker.adb
index 08a1fb9e31..08a1fb9e31 100644
--- a/c/src/ada-tests/samples/ticker/ticker.adb
+++ b/testsuites/ada/samples/ticker/ticker.adb