[rtems commit] ada-tests: Move to testsuites/ada

Sebastian Huber sebh at rtems.org
Thu Oct 12 08:55:58 UTC 2017


Module:    rtems
Branch:    master
Commit:    ee537ea3dd964d4de3565a36b4857af31fb5a3f4
Changeset: http://git.rtems.org/rtems/commit/?id=ee537ea3dd964d4de3565a36b4857af31fb5a3f4

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Thu Oct 12 10:00:10 2017 +0200

ada-tests: Move to testsuites/ada

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

Close #3079.

---

 c/src/ada-tests/Makefile.am                                 | 13 -------------
 c/src/ada-tests/mptests/mp01/Makefile.am                    |  4 ----
 c/src/ada-tests/mptests/mp03/Makefile.am                    |  4 ----
 c/src/ada-tests/mptests/mp04/Makefile.am                    |  4 ----
 c/src/ada-tests/mptests/mp05/Makefile.am                    |  4 ----
 c/src/ada-tests/mptests/mp06/Makefile.am                    |  4 ----
 c/src/ada-tests/mptests/mp07/Makefile.am                    |  4 ----
 c/src/ada-tests/mptests/mp08/Makefile.am                    |  4 ----
 c/src/ada-tests/mptests/mp09/Makefile.am                    |  4 ----
 c/src/ada-tests/mptests/mp10/Makefile.am                    |  4 ----
 c/src/ada-tests/mptests/mp11/Makefile.am                    |  4 ----
 c/src/ada-tests/mptests/mp12/Makefile.am                    |  4 ----
 c/src/ada-tests/mptests/mp13/Makefile.am                    |  4 ----
 c/src/ada-tests/mptests/mp14/Makefile.am                    |  4 ----
 c/src/configure.ac                                          |  9 ---------
 testsuites/ada/Makefile.am                                  | 13 +++++++++++++
 {c/src/ada-tests => testsuites/ada}/aclocal/prog-gnat.m4    |  0
 {c/src/ada-tests => testsuites/ada}/ada.am                  |  0
 {c/src/ada-tests => testsuites/ada}/ada_mvscn               |  0
 {c/src/ada-tests => testsuites/ada}/configure.ac            |  4 +---
 {c/src/ada-tests => testsuites/ada}/mptests/Makefile.am     |  4 ++--
 testsuites/ada/mptests/mp01/Makefile.am                     |  4 ++++
 .../mp14 => testsuites/ada/mptests/mp01}/config_base.h      |  0
 {c/src/ada-tests => testsuites/ada}/mptests/mp01/mp01.adb   |  0
 {c/src/ada-tests => testsuites/ada}/mptests/mp01/mptest.adb |  0
 {c/src/ada-tests => testsuites/ada}/mptests/mp01/mptest.ads |  0
 .../ada}/mptests/mp01/node1/Makefile.am                     |  4 ++--
 .../ada}/mptests/mp01/node1/ada_mp01-node1.scn              |  0
 .../mp14 => testsuites/ada/mptests/mp01}/node1/config.h     |  0
 .../ada}/mptests/mp01/node1/mp01_node1.adb                  |  0
 .../ada}/mptests/mp01/node2/Makefile.am                     |  4 ++--
 .../ada}/mptests/mp01/node2/ada_mp01-node2.scn              |  0
 .../mp14 => testsuites/ada/mptests/mp01}/node2/config.h     |  0
 .../ada}/mptests/mp01/node2/mp01_node2.adb                  |  0
 testsuites/ada/mptests/mp03/Makefile.am                     |  4 ++++
 .../mp13 => testsuites/ada/mptests/mp03}/config_base.h      |  0
 {c/src/ada-tests => testsuites/ada}/mptests/mp03/mptest.adb |  0
 {c/src/ada-tests => testsuites/ada}/mptests/mp03/mptest.ads |  0
 .../ada}/mptests/mp03/node1/Makefile.am                     |  4 ++--
 .../ada}/mptests/mp03/node1/ada_mp03-node1.scn              |  0
 .../mp13 => testsuites/ada/mptests/mp03}/node1/config.h     |  0
 .../ada}/mptests/mp03/node1/mp03_node1.adb                  |  0
 .../ada}/mptests/mp03/node2/Makefile.am                     |  4 ++--
 .../ada}/mptests/mp03/node2/ada_mp03-node2.scn              |  0
 .../mp13 => testsuites/ada/mptests/mp03}/node2/config.h     |  0
 .../ada}/mptests/mp03/node2/mp03_node2.adb                  |  0
 testsuites/ada/mptests/mp04/Makefile.am                     |  4 ++++
 .../mp12 => testsuites/ada/mptests/mp04}/config_base.h      |  0
 {c/src/ada-tests => testsuites/ada}/mptests/mp04/mptest.adb |  0
 {c/src/ada-tests => testsuites/ada}/mptests/mp04/mptest.ads |  0
 .../ada}/mptests/mp04/node1/Makefile.am                     |  4 ++--
 .../ada}/mptests/mp04/node1/ada_mp04-node1.scn              |  0
 .../mp12 => testsuites/ada/mptests/mp04}/node1/config.h     |  0
 .../ada}/mptests/mp04/node1/mp04_node1.adb                  |  0
 .../ada}/mptests/mp04/node2/Makefile.am                     |  4 ++--
 .../ada}/mptests/mp04/node2/ada_mp04-node2.scn              |  0
 .../mp12 => testsuites/ada/mptests/mp04}/node2/config.h     |  0
 .../ada}/mptests/mp04/node2/mp04_node2.adb                  |  0
 testsuites/ada/mptests/mp05/Makefile.am                     |  4 ++++
 .../mp11 => testsuites/ada/mptests/mp05}/config_base.h      |  0
 {c/src/ada-tests => testsuites/ada}/mptests/mp05/mptest.adb |  0
 {c/src/ada-tests => testsuites/ada}/mptests/mp05/mptest.ads |  0
 .../ada}/mptests/mp05/node1/Makefile.am                     |  4 ++--
 .../ada}/mptests/mp05/node1/ada_mp05-node1.scn              |  0
 .../mp11 => testsuites/ada/mptests/mp05}/node1/config.h     |  0
 .../ada}/mptests/mp05/node1/mp05_node1.adb                  |  0
 .../ada}/mptests/mp05/node2/Makefile.am                     |  4 ++--
 .../ada}/mptests/mp05/node2/ada_mp05-node2.scn              |  0
 .../mp11 => testsuites/ada/mptests/mp05}/node2/config.h     |  0
 .../ada}/mptests/mp05/node2/mp05_node2.adb                  |  0
 testsuites/ada/mptests/mp06/Makefile.am                     |  4 ++++
 .../mp10 => testsuites/ada/mptests/mp06}/config_base.h      |  0
 {c/src/ada-tests => testsuites/ada}/mptests/mp06/mptest.adb |  0
 {c/src/ada-tests => testsuites/ada}/mptests/mp06/mptest.ads |  0
 .../ada}/mptests/mp06/node1/Makefile.am                     |  4 ++--
 .../ada}/mptests/mp06/node1/ada_mp06-node1.scn              |  0
 .../mp10 => testsuites/ada/mptests/mp06}/node1/config.h     |  0
 .../ada}/mptests/mp06/node1/mp06_node1.adb                  |  0
 .../ada}/mptests/mp06/node2/Makefile.am                     |  4 ++--
 .../ada}/mptests/mp06/node2/ada_mp06-node2.scn              |  0
 .../mp10 => testsuites/ada/mptests/mp06}/node2/config.h     |  0
 .../ada}/mptests/mp06/node2/mp06_node2.adb                  |  0
 testsuites/ada/mptests/mp07/Makefile.am                     |  4 ++++
 .../mp09 => testsuites/ada/mptests/mp07}/config_base.h      |  0
 {c/src/ada-tests => testsuites/ada}/mptests/mp07/mptest.adb |  0
 {c/src/ada-tests => testsuites/ada}/mptests/mp07/mptest.ads |  0
 .../ada}/mptests/mp07/node1/Makefile.am                     |  4 ++--
 .../ada}/mptests/mp07/node1/ada_mp07-node1.scn              |  0
 .../mp09 => testsuites/ada/mptests/mp07}/node1/config.h     |  0
 .../ada}/mptests/mp07/node1/mp07_node1.adb                  |  0
 .../ada}/mptests/mp07/node2/Makefile.am                     |  4 ++--
 .../ada}/mptests/mp07/node2/ada_mp07-node2.scn              |  0
 .../mp09 => testsuites/ada/mptests/mp07}/node2/config.h     |  0
 .../ada}/mptests/mp07/node2/mp07_node2.adb                  |  0
 testsuites/ada/mptests/mp08/Makefile.am                     |  4 ++++
 .../ada-tests => testsuites/ada}/mptests/mp08/config_base.h |  0
 {c/src/ada-tests => testsuites/ada}/mptests/mp08/mptest.adb |  0
 {c/src/ada-tests => testsuites/ada}/mptests/mp08/mptest.ads |  0
 .../ada}/mptests/mp08/node1/Makefile.am                     |  4 ++--
 .../ada}/mptests/mp08/node1/ada_mp08-node1.scn              |  0
 .../ada}/mptests/mp08/node1/config.h                        |  0
 .../ada}/mptests/mp08/node1/mp08_node1.adb                  |  0
 .../ada}/mptests/mp08/node2/Makefile.am                     |  4 ++--
 .../ada}/mptests/mp08/node2/ada_mp08-node2.scn              |  0
 .../ada}/mptests/mp08/node2/config.h                        |  0
 .../ada}/mptests/mp08/node2/mp08_node2.adb                  |  0
 testsuites/ada/mptests/mp09/Makefile.am                     |  4 ++++
 .../mp07 => testsuites/ada/mptests/mp09}/config_base.h      |  0
 {c/src/ada-tests => testsuites/ada}/mptests/mp09/mptest.adb |  0
 {c/src/ada-tests => testsuites/ada}/mptests/mp09/mptest.ads |  0
 .../ada}/mptests/mp09/node1/Makefile.am                     |  4 ++--
 .../ada}/mptests/mp09/node1/ada_mp09-node1.scn              |  0
 .../mp07 => testsuites/ada/mptests/mp09}/node1/config.h     |  0
 .../ada}/mptests/mp09/node1/mp09_node1.adb                  |  0
 .../ada}/mptests/mp09/node2/Makefile.am                     |  4 ++--
 .../ada}/mptests/mp09/node2/ada_mp09-node2.scn              |  0
 .../mp07 => testsuites/ada/mptests/mp09}/node2/config.h     |  0
 .../ada}/mptests/mp09/node2/mp09_node2.adb                  |  0
 testsuites/ada/mptests/mp10/Makefile.am                     |  4 ++++
 .../mp06 => testsuites/ada/mptests/mp10}/config_base.h      |  0
 {c/src/ada-tests => testsuites/ada}/mptests/mp10/mptest.adb |  0
 {c/src/ada-tests => testsuites/ada}/mptests/mp10/mptest.ads |  0
 .../ada}/mptests/mp10/node1/Makefile.am                     |  4 ++--
 .../ada}/mptests/mp10/node1/ada_mp10-node1.scn              |  0
 .../mp06 => testsuites/ada/mptests/mp10}/node1/config.h     |  0
 .../ada}/mptests/mp10/node1/mp10_node1.adb                  |  0
 .../ada}/mptests/mp10/node2/Makefile.am                     |  4 ++--
 .../ada}/mptests/mp10/node2/ada_mp10-node2.scn              |  0
 .../mp06 => testsuites/ada/mptests/mp10}/node2/config.h     |  0
 .../ada}/mptests/mp10/node2/mp10_node2.adb                  |  0
 testsuites/ada/mptests/mp11/Makefile.am                     |  4 ++++
 .../mp05 => testsuites/ada/mptests/mp11}/config_base.h      |  0
 {c/src/ada-tests => testsuites/ada}/mptests/mp11/mptest.adb |  0
 {c/src/ada-tests => testsuites/ada}/mptests/mp11/mptest.ads |  0
 .../ada}/mptests/mp11/node1/Makefile.am                     |  4 ++--
 .../ada}/mptests/mp11/node1/ada_mp11-node1.scn              |  0
 .../mp05 => testsuites/ada/mptests/mp11}/node1/config.h     |  0
 .../ada}/mptests/mp11/node1/mp11_node1.adb                  |  0
 .../ada}/mptests/mp11/node2/Makefile.am                     |  4 ++--
 .../ada}/mptests/mp11/node2/ada_mp11-node2.scn              |  0
 .../mp05 => testsuites/ada/mptests/mp11}/node2/config.h     |  0
 .../ada}/mptests/mp11/node2/mp11_node2.adb                  |  0
 testsuites/ada/mptests/mp12/Makefile.am                     |  4 ++++
 .../mp04 => testsuites/ada/mptests/mp12}/config_base.h      |  0
 {c/src/ada-tests => testsuites/ada}/mptests/mp12/mptest.adb |  0
 {c/src/ada-tests => testsuites/ada}/mptests/mp12/mptest.ads |  0
 .../ada}/mptests/mp12/node1/Makefile.am                     |  4 ++--
 .../ada}/mptests/mp12/node1/ada_mp12-node1.scn              |  0
 .../mp04 => testsuites/ada/mptests/mp12}/node1/config.h     |  0
 .../ada}/mptests/mp12/node1/mp12_node1.adb                  |  0
 .../ada}/mptests/mp12/node2/Makefile.am                     |  4 ++--
 .../ada}/mptests/mp12/node2/ada_mp12-node2.scn              |  0
 .../mp04 => testsuites/ada/mptests/mp12}/node2/config.h     |  0
 .../ada}/mptests/mp12/node2/mp12_node2.adb                  |  0
 testsuites/ada/mptests/mp13/Makefile.am                     |  4 ++++
 .../mp03 => testsuites/ada/mptests/mp13}/config_base.h      |  0
 {c/src/ada-tests => testsuites/ada}/mptests/mp13/mptest.adb |  0
 {c/src/ada-tests => testsuites/ada}/mptests/mp13/mptest.ads |  0
 .../ada}/mptests/mp13/node1/Makefile.am                     |  4 ++--
 .../ada}/mptests/mp13/node1/ada_mp13-node1.scn              |  0
 .../mp03 => testsuites/ada/mptests/mp13}/node1/config.h     |  0
 .../ada}/mptests/mp13/node1/mp13_node1.adb                  |  0
 .../ada}/mptests/mp13/node2/Makefile.am                     |  4 ++--
 .../ada}/mptests/mp13/node2/ada_mp13-node2.scn              |  0
 .../mp03 => testsuites/ada/mptests/mp13}/node2/config.h     |  0
 .../ada}/mptests/mp13/node2/mp13_node2.adb                  |  0
 testsuites/ada/mptests/mp14/Makefile.am                     |  4 ++++
 .../mp01 => testsuites/ada/mptests/mp14}/config_base.h      |  0
 {c/src/ada-tests => testsuites/ada}/mptests/mp14/mptest.adb |  0
 {c/src/ada-tests => testsuites/ada}/mptests/mp14/mptest.ads |  0
 .../ada}/mptests/mp14/node1/Makefile.am                     |  4 ++--
 .../ada}/mptests/mp14/node1/ada_mp14-node1.scn              |  0
 .../mp01 => testsuites/ada/mptests/mp14}/node1/config.h     |  0
 .../ada}/mptests/mp14/node1/mp14_node1.adb                  |  0
 .../ada}/mptests/mp14/node2/Makefile.am                     |  4 ++--
 .../ada}/mptests/mp14/node2/ada_mp14-node2.scn              |  0
 .../mp01 => testsuites/ada/mptests/mp14}/node2/config.h     |  0
 .../ada}/mptests/mp14/node2/mp14_node2.adb                  |  0
 {c/src/ada-tests => testsuites/ada}/samples/Makefile.am     |  4 ++--
 .../ada}/samples/base_mp/Makefile.am                        |  6 +++---
 .../ada-tests => testsuites/ada}/samples/base_mp/config.h   |  0
 .../ada-tests => testsuites/ada}/samples/base_mp/mptest.adb |  0
 .../ada-tests => testsuites/ada}/samples/base_mp/mptest.ads |  0
 .../ada}/samples/base_mp/node1/Makefile.am                  |  4 ++--
 .../ada}/samples/base_mp/node1/ada_base_mp-node1.scn        |  0
 .../ada}/samples/base_mp/node2/Makefile.am                  |  4 ++--
 .../ada}/samples/base_mp/node2/ada_base_mp-node2.scn        |  0
 .../ada}/samples/base_sp/Makefile.am                        |  4 ++--
 .../ada}/samples/base_sp/ada_base_sp.scn                    |  0
 .../ada}/samples/base_sp/base_sp.adb                        |  0
 .../ada-tests => testsuites/ada}/samples/base_sp/config.h   |  0
 .../ada-tests => testsuites/ada}/samples/base_sp/sptest.adb |  0
 .../ada-tests => testsuites/ada}/samples/base_sp/sptest.ads |  0
 .../ada-tests => testsuites/ada}/samples/hello/Makefile.am  |  4 ++--
 .../ada}/samples/hello/ada_hello.scn                        |  0
 .../spname01 => testsuites/ada/samples/hello}/config.h      |  0
 {c/src/ada-tests => testsuites/ada}/samples/hello/hello.adb |  0
 .../ada-tests => testsuites/ada}/samples/hello/sptest.adb   |  0
 .../ada-tests => testsuites/ada}/samples/hello/sptest.ads   |  0
 .../ada-tests => testsuites/ada}/samples/nsecs/Makefile.am  |  4 ++--
 .../ada}/samples/nsecs/ada_nsecs.scn                        |  0
 {c/src/ada-tests => testsuites/ada}/samples/nsecs/config.h  |  0
 {c/src/ada-tests => testsuites/ada}/samples/nsecs/nsecs.adb |  0
 .../ada-tests => testsuites/ada}/samples/nsecs/sptest.adb   |  0
 .../ada-tests => testsuites/ada}/samples/nsecs/sptest.ads   |  0
 .../ada-tests => testsuites/ada}/samples/ticker/Makefile.am |  4 ++--
 .../ada}/samples/ticker/ada_ticker.scn                      |  0
 .../sptests/sp02 => testsuites/ada/samples/ticker}/config.h |  0
 .../ada-tests => testsuites/ada}/samples/ticker/sptest.adb  |  0
 .../sp01 => testsuites/ada/samples/ticker}/sptest.ads       |  0
 .../ada-tests => testsuites/ada}/samples/ticker/ticker.adb  |  0
 {c/src/ada-tests => testsuites/ada}/sptests/Makefile.am     |  4 ++--
 .../ada-tests => testsuites/ada}/sptests/sp01/Makefile.am   |  4 ++--
 .../ada-tests => testsuites/ada}/sptests/sp01/ada_sp01.scn  |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp01/config.h   |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp01/sp01.adb   |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp01/sptest.adb |  0
 .../ticker => testsuites/ada/sptests/sp01}/sptest.ads       |  0
 .../ada-tests => testsuites/ada}/sptests/sp02/Makefile.am   |  4 ++--
 .../ada-tests => testsuites/ada}/sptests/sp02/ada_sp02.scn  |  0
 .../samples/ticker => testsuites/ada/sptests/sp02}/config.h |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp02/sp02.adb   |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp02/sptest.adb |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp02/sptest.ads |  0
 .../ada-tests => testsuites/ada}/sptests/sp03/Makefile.am   |  4 ++--
 .../ada-tests => testsuites/ada}/sptests/sp03/ada_sp03.scn  |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp03/config.h   |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp03/sp03.adb   |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp03/sptest.adb |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp03/sptest.ads |  0
 .../ada-tests => testsuites/ada}/sptests/sp04/Makefile.am   |  4 ++--
 {c/src/ada-tests => testsuites/ada}/sptests/sp04/README     |  0
 .../ada-tests => testsuites/ada}/sptests/sp04/ada_sp04.scn  |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp04/config.h   |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp04/sp04.adb   |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp04/sptest.adb |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp04/sptest.ads |  0
 .../ada-tests => testsuites/ada}/sptests/sp05/Makefile.am   |  4 ++--
 .../ada-tests => testsuites/ada}/sptests/sp05/ada_sp05.scn  |  0
 .../sptests/sp06 => testsuites/ada/sptests/sp05}/config.h   |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp05/sp05.adb   |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp05/sptest.adb |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp05/sptest.ads |  0
 .../ada-tests => testsuites/ada}/sptests/sp06/Makefile.am   |  4 ++--
 .../ada-tests => testsuites/ada}/sptests/sp06/ada_sp06.scn  |  0
 .../sptests/sp05 => testsuites/ada/sptests/sp06}/config.h   |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp06/sp06.adb   |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp06/sptest.adb |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp06/sptest.ads |  0
 .../ada-tests => testsuites/ada}/sptests/sp07/Makefile.am   |  4 ++--
 .../ada-tests => testsuites/ada}/sptests/sp07/ada_sp07.scn  |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp07/config.h   |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp07/sp07.adb   |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp07/sptest.adb |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp07/sptest.ads |  0
 .../ada-tests => testsuites/ada}/sptests/sp08/Makefile.am   |  4 ++--
 .../ada-tests => testsuites/ada}/sptests/sp08/ada_sp08.scn  |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp08/config.h   |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp08/sp08.adb   |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp08/sptest.adb |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp08/sptest.ads |  0
 .../ada-tests => testsuites/ada}/sptests/sp09/Makefile.am   |  4 ++--
 .../ada-tests => testsuites/ada}/sptests/sp09/ada_sp09.scn  |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp09/config.h   |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp09/sp09.adb   |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp09/sptest.adb |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp09/sptest.ads |  0
 .../ada-tests => testsuites/ada}/sptests/sp11/Makefile.am   |  4 ++--
 .../ada-tests => testsuites/ada}/sptests/sp11/ada_sp11.scn  |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp11/config.h   |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp11/sp11.adb   |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp11/sptest.adb |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp11/sptest.ads |  0
 .../ada-tests => testsuites/ada}/sptests/sp12/Makefile.am   |  4 ++--
 .../ada-tests => testsuites/ada}/sptests/sp12/ada_sp12.scn  |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp12/config.h   |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp12/sp12.adb   |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp12/sptest.adb |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp12/sptest.ads |  0
 .../ada-tests => testsuites/ada}/sptests/sp13/Makefile.am   |  4 ++--
 .../ada-tests => testsuites/ada}/sptests/sp13/ada_sp13.scn  |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp13/config.h   |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp13/sp13.adb   |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp13/sptest.adb |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp13/sptest.ads |  0
 .../ada-tests => testsuites/ada}/sptests/sp14/Makefile.am   |  4 ++--
 .../ada-tests => testsuites/ada}/sptests/sp14/ada_sp14.scn  |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp14/config.h   |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp14/sp14.adb   |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp14/sptest.adb |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp14/sptest.ads |  0
 .../ada-tests => testsuites/ada}/sptests/sp15/Makefile.am   |  4 ++--
 .../ada-tests => testsuites/ada}/sptests/sp15/ada_sp15.scn  |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp15/config.h   |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp15/sp15.adb   |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp15/sptest.adb |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp15/sptest.ads |  0
 .../ada-tests => testsuites/ada}/sptests/sp16/Makefile.am   |  4 ++--
 .../ada-tests => testsuites/ada}/sptests/sp16/ada_sp16.scn  |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp16/config.h   |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp16/sp16.adb   |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp16/sptest.adb |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp16/sptest.ads |  0
 .../ada-tests => testsuites/ada}/sptests/sp17/Makefile.am   |  4 ++--
 .../ada-tests => testsuites/ada}/sptests/sp17/ada_sp17.scn  |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp17/config.h   |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp17/sp17.adb   |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp17/sptest.adb |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp17/sptest.ads |  0
 .../ada-tests => testsuites/ada}/sptests/sp19/Makefile.am   |  4 ++--
 {c/src/ada-tests => testsuites/ada}/sptests/sp19/README     |  0
 .../ada-tests => testsuites/ada}/sptests/sp19/ada_sp19.scn  |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp19/config.h   |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp19/sp19.adb   |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp19/sptest.adp |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp19/sptest.ads |  0
 .../ada-tests => testsuites/ada}/sptests/sp20/Makefile.am   |  4 ++--
 .../ada-tests => testsuites/ada}/sptests/sp20/ada_sp20.scn  |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp20/config.h   |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp20/sp20.adb   |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp20/sptest.adb |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp20/sptest.ads |  0
 .../ada-tests => testsuites/ada}/sptests/sp22/Makefile.am   |  4 ++--
 .../ada-tests => testsuites/ada}/sptests/sp22/ada_sp22.scn  |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp22/config.h   |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp22/sp22.adb   |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp22/sptest.adb |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp22/sptest.ads |  0
 .../ada-tests => testsuites/ada}/sptests/sp23/Makefile.am   |  4 ++--
 .../ada-tests => testsuites/ada}/sptests/sp23/ada_sp23.scn  |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp23/config.h   |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp23/sp23.adb   |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp23/sptest.adb |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp23/sptest.ads |  0
 .../ada-tests => testsuites/ada}/sptests/sp24/Makefile.am   |  4 ++--
 .../ada-tests => testsuites/ada}/sptests/sp24/ada_sp24.scn  |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp24/config.h   |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp24/sp24.adb   |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp24/sptest.adb |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp24/sptest.ads |  0
 .../ada-tests => testsuites/ada}/sptests/sp25/Makefile.am   |  4 ++--
 .../ada-tests => testsuites/ada}/sptests/sp25/ada_sp25.scn  |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp25/config.h   |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp25/sp25.adb   |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp25/sptest.adb |  0
 {c/src/ada-tests => testsuites/ada}/sptests/sp25/sptest.ads |  0
 .../ada}/sptests/spatcb01/Makefile.am                       |  4 ++--
 .../ada}/sptests/spatcb01/ada_spatcb01.scn                  |  0
 .../ada-tests => testsuites/ada}/sptests/spatcb01/config.h  |  0
 .../ada}/sptests/spatcb01/spatcb01.adb                      |  0
 .../ada}/sptests/spname01/Makefile.am                       |  4 ++--
 .../ada}/sptests/spname01/ada_spname01.scn                  |  0
 .../hello => testsuites/ada/sptests/spname01}/config.h      |  0
 .../ada}/sptests/spname01/spname01.adb                      |  0
 .../ada}/sptests/spname01/sptest.adb                        |  0
 .../ada}/sptests/spname01/sptest.ads                        |  0
 {c/src/ada-tests => testsuites/ada}/support/Makefile.am     |  2 +-
 {c/src/ada-tests => testsuites/ada}/support/address_io.adb  |  0
 {c/src/ada-tests => testsuites/ada}/support/address_io.ads  |  0
 {c/src/ada-tests => testsuites/ada}/support/float_io.ads    |  0
 {c/src/ada-tests => testsuites/ada}/support/fp.inc          |  0
 {c/src/ada-tests => testsuites/ada}/support/init.c          |  0
 {c/src/ada-tests => testsuites/ada}/support/integer.inc     |  0
 .../ada}/support/rtems_calling_overhead.ads                 |  0
 {c/src/ada-tests => testsuites/ada}/support/status_io.ads   |  0
 .../ada-tests => testsuites/ada}/support/test_support.adb   |  0
 .../ada-tests => testsuites/ada}/support/test_support.ads   |  0
 .../ada}/support/time_test_support.adb                      |  0
 .../ada}/support/time_test_support.ads                      |  0
 .../ada-tests => testsuites/ada}/support/timer_driver.adb   |  0
 .../ada-tests => testsuites/ada}/support/timer_driver.ads   |  0
 .../ada-tests => testsuites/ada}/support/unsigned32_io.ads  |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/Makefile.am     |  4 ++--
 .../ada-tests => testsuites/ada}/tmtests/tm01/Makefile.am   |  4 ++--
 .../tmoverhd => testsuites/ada/tmtests/tm01}/config.h       |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm01/tm01.adb   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm01/tmtest.adb |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm01/tmtest.ads |  0
 .../ada-tests => testsuites/ada}/tmtests/tm02/Makefile.am   |  4 ++--
 .../tmtests/tm08 => testsuites/ada/tmtests/tm02}/config.h   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm02/tm02.adb   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm02/tmtest.adb |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm02/tmtest.ads |  0
 .../ada-tests => testsuites/ada}/tmtests/tm03/Makefile.am   |  4 ++--
 .../tmtests/tm07 => testsuites/ada/tmtests/tm03}/config.h   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm03/tm03.adb   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm03/tmtest.adb |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm03/tmtest.ads |  0
 .../ada-tests => testsuites/ada}/tmtests/tm04/Makefile.am   |  4 ++--
 .../tmtests/tm25 => testsuites/ada/tmtests/tm04}/config.h   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm04/tm04.adb   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm04/tmtest.adb |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm04/tmtest.ads |  0
 .../ada-tests => testsuites/ada}/tmtests/tm05/Makefile.am   |  4 ++--
 .../tmtests/tm06 => testsuites/ada/tmtests/tm05}/config.h   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm05/tm05.adb   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm05/tmtest.adb |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm05/tmtest.ads |  0
 .../ada-tests => testsuites/ada}/tmtests/tm06/Makefile.am   |  4 ++--
 .../tmtests/tm05 => testsuites/ada/tmtests/tm06}/config.h   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm06/tm06.adb   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm06/tmtest.adb |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm06/tmtest.ads |  0
 .../ada-tests => testsuites/ada}/tmtests/tm07/Makefile.am   |  4 ++--
 .../tmtests/tm03 => testsuites/ada/tmtests/tm07}/config.h   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm07/tm07.adb   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm07/tmtest.adb |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm07/tmtest.ads |  0
 .../ada-tests => testsuites/ada}/tmtests/tm08/Makefile.am   |  4 ++--
 .../tmtests/tm02 => testsuites/ada/tmtests/tm08}/config.h   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm08/tm08.adb   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm08/tmtest.adb |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm08/tmtest.ads |  0
 .../ada-tests => testsuites/ada}/tmtests/tm09/Makefile.am   |  4 ++--
 {c/src/ada-tests => testsuites/ada}/tmtests/tm09/config.h   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm09/tm09.adb   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm09/tmtest.adb |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm09/tmtest.ads |  0
 .../ada-tests => testsuites/ada}/tmtests/tm10/Makefile.am   |  4 ++--
 {c/src/ada-tests => testsuites/ada}/tmtests/tm10/config.h   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm10/tm10.adb   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm10/tmtest.adb |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm10/tmtest.ads |  0
 .../ada-tests => testsuites/ada}/tmtests/tm11/Makefile.am   |  4 ++--
 .../tmtests/tm19 => testsuites/ada/tmtests/tm11}/config.h   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm11/tm11.adb   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm11/tmtest.adb |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm11/tmtest.ads |  0
 .../ada-tests => testsuites/ada}/tmtests/tm12/Makefile.am   |  4 ++--
 .../tmtests/tm18 => testsuites/ada/tmtests/tm12}/config.h   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm12/tm12.adb   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm12/tmtest.adb |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm12/tmtest.ads |  0
 .../ada-tests => testsuites/ada}/tmtests/tm13/Makefile.am   |  4 ++--
 .../tmtests/tm17 => testsuites/ada/tmtests/tm13}/config.h   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm13/tm13.adb   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm13/tmtest.adb |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm13/tmtest.ads |  0
 .../ada-tests => testsuites/ada}/tmtests/tm14/Makefile.am   |  4 ++--
 .../tmtests/tm16 => testsuites/ada/tmtests/tm14}/config.h   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm14/tm14.adb   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm14/tmtest.adb |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm14/tmtest.ads |  0
 .../ada-tests => testsuites/ada}/tmtests/tm15/Makefile.am   |  4 ++--
 {c/src/ada-tests => testsuites/ada}/tmtests/tm15/config.h   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm15/tm15.adb   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm15/tmtest.adb |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm15/tmtest.ads |  0
 .../ada-tests => testsuites/ada}/tmtests/tm16/Makefile.am   |  4 ++--
 .../tmtests/tm14 => testsuites/ada/tmtests/tm16}/config.h   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm16/tm16.adb   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm16/tmtest.adb |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm16/tmtest.ads |  0
 .../ada-tests => testsuites/ada}/tmtests/tm17/Makefile.am   |  4 ++--
 .../tmtests/tm13 => testsuites/ada/tmtests/tm17}/config.h   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm17/tm17.adb   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm17/tmtest.adb |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm17/tmtest.ads |  0
 .../ada-tests => testsuites/ada}/tmtests/tm18/Makefile.am   |  4 ++--
 .../tmtests/tm12 => testsuites/ada/tmtests/tm18}/config.h   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm18/tm18.adb   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm18/tmtest.adb |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm18/tmtest.ads |  0
 .../ada-tests => testsuites/ada}/tmtests/tm19/Makefile.am   |  4 ++--
 .../tmtests/tm11 => testsuites/ada/tmtests/tm19}/config.h   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm19/tm19.adb   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm19/tmtest.adb |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm19/tmtest.ads |  0
 .../ada-tests => testsuites/ada}/tmtests/tm20/Makefile.am   |  4 ++--
 {c/src/ada-tests => testsuites/ada}/tmtests/tm20/config.h   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm20/tm20.adb   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm20/tmtest.adb |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm20/tmtest.ads |  0
 .../ada-tests => testsuites/ada}/tmtests/tm21/Makefile.am   |  4 ++--
 {c/src/ada-tests => testsuites/ada}/tmtests/tm21/config.h   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm21/tm21.adb   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm21/tmtest.adb |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm21/tmtest.ads |  0
 .../ada-tests => testsuites/ada}/tmtests/tm22/Makefile.am   |  4 ++--
 {c/src/ada-tests => testsuites/ada}/tmtests/tm22/config.h   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm22/tm22.adb   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm22/tmtest.adb |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm22/tmtest.ads |  0
 .../ada-tests => testsuites/ada}/tmtests/tm23/Makefile.am   |  4 ++--
 {c/src/ada-tests => testsuites/ada}/tmtests/tm23/config.h   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm23/tm23.adb   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm23/tmtest.adb |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm23/tmtest.ads |  0
 .../ada-tests => testsuites/ada}/tmtests/tm24/Makefile.am   |  4 ++--
 {c/src/ada-tests => testsuites/ada}/tmtests/tm24/config.h   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm24/tm24.adb   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm24/tmtest.adb |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm24/tmtest.ads |  0
 .../ada-tests => testsuites/ada}/tmtests/tm25/Makefile.am   |  4 ++--
 .../tmtests/tm04 => testsuites/ada/tmtests/tm25}/config.h   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm25/tm25.adb   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm25/tmtest.adb |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm25/tmtest.ads |  0
 .../ada-tests => testsuites/ada}/tmtests/tm28/Makefile.am   |  4 ++--
 {c/src/ada-tests => testsuites/ada}/tmtests/tm28/config.h   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm28/tm28.adb   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm28/tmtest.adb |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm28/tmtest.ads |  0
 .../ada-tests => testsuites/ada}/tmtests/tm29/Makefile.am   |  4 ++--
 {c/src/ada-tests => testsuites/ada}/tmtests/tm29/config.h   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm29/tm29.adb   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm29/tmtest.adb |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tm29/tmtest.ads |  0
 .../ada-tests => testsuites/ada}/tmtests/tmck/Makefile.am   |  4 ++--
 {c/src/ada-tests => testsuites/ada}/tmtests/tmck/config.h   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tmck/tmck.adb   |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tmck/tmtest.adb |  0
 {c/src/ada-tests => testsuites/ada}/tmtests/tmck/tmtest.ads |  0
 .../ada}/tmtests/tmoverhd/Makefile.am                       |  4 ++--
 {c/src/ada-tests => testsuites/ada}/tmtests/tmoverhd/README |  0
 .../tm01 => testsuites/ada/tmtests/tmoverhd}/config.h       |  0
 .../ada}/tmtests/tmoverhd/dummy_rtems.adb                   |  0
 .../ada}/tmtests/tmoverhd/dummy_rtems.ads                   |  0
 .../ada}/tmtests/tmoverhd/tmoverhd.adb                      |  0
 .../ada}/tmtests/tmoverhd/tmtest.adb                        |  0
 .../ada}/tmtests/tmoverhd/tmtest.ads                        |  0
 testsuites/configure.ac                                     | 11 +++++++++++
 522 files changed, 259 insertions(+), 259 deletions(-)

diff --git a/c/src/ada-tests/Makefile.am b/c/src/ada-tests/Makefile.am
deleted file mode 100644
index f097f9f..0000000
--- a/c/src/ada-tests/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-ACLOCAL_AMFLAGS = -I aclocal -I ../../../testsuites/aclocal
-
-_SUBDIRS = support samples sptests tmtests
-if HAS_MP
-_SUBDIRS += mptests
-endif
-
-DIST_SUBDIRS = support samples sptests tmtests mptests
-
-EXTRA_DIST = ada.am
-
-include $(top_srcdir)/../../../testsuites/automake/subdirs.am
-include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp01/Makefile.am b/c/src/ada-tests/mptests/mp01/Makefile.am
deleted file mode 100644
index 43bba78..0000000
--- a/c/src/ada-tests/mptests/mp01/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-_SUBDIRS = node1 node2
-
-include $(top_srcdir)/../../../testsuites/automake/subdirs.am
-include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp03/Makefile.am b/c/src/ada-tests/mptests/mp03/Makefile.am
deleted file mode 100644
index 43bba78..0000000
--- a/c/src/ada-tests/mptests/mp03/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-_SUBDIRS = node1 node2
-
-include $(top_srcdir)/../../../testsuites/automake/subdirs.am
-include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp04/Makefile.am b/c/src/ada-tests/mptests/mp04/Makefile.am
deleted file mode 100644
index 43bba78..0000000
--- a/c/src/ada-tests/mptests/mp04/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-_SUBDIRS = node1 node2
-
-include $(top_srcdir)/../../../testsuites/automake/subdirs.am
-include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp05/Makefile.am b/c/src/ada-tests/mptests/mp05/Makefile.am
deleted file mode 100644
index 43bba78..0000000
--- a/c/src/ada-tests/mptests/mp05/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-_SUBDIRS = node1 node2
-
-include $(top_srcdir)/../../../testsuites/automake/subdirs.am
-include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp06/Makefile.am b/c/src/ada-tests/mptests/mp06/Makefile.am
deleted file mode 100644
index 43bba78..0000000
--- a/c/src/ada-tests/mptests/mp06/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-_SUBDIRS = node1 node2
-
-include $(top_srcdir)/../../../testsuites/automake/subdirs.am
-include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp07/Makefile.am b/c/src/ada-tests/mptests/mp07/Makefile.am
deleted file mode 100644
index 43bba78..0000000
--- a/c/src/ada-tests/mptests/mp07/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-_SUBDIRS = node1 node2
-
-include $(top_srcdir)/../../../testsuites/automake/subdirs.am
-include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp08/Makefile.am b/c/src/ada-tests/mptests/mp08/Makefile.am
deleted file mode 100644
index 43bba78..0000000
--- a/c/src/ada-tests/mptests/mp08/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-_SUBDIRS = node1 node2
-
-include $(top_srcdir)/../../../testsuites/automake/subdirs.am
-include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp09/Makefile.am b/c/src/ada-tests/mptests/mp09/Makefile.am
deleted file mode 100644
index 43bba78..0000000
--- a/c/src/ada-tests/mptests/mp09/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-_SUBDIRS = node1 node2
-
-include $(top_srcdir)/../../../testsuites/automake/subdirs.am
-include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp10/Makefile.am b/c/src/ada-tests/mptests/mp10/Makefile.am
deleted file mode 100644
index 43bba78..0000000
--- a/c/src/ada-tests/mptests/mp10/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-_SUBDIRS = node1 node2
-
-include $(top_srcdir)/../../../testsuites/automake/subdirs.am
-include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp11/Makefile.am b/c/src/ada-tests/mptests/mp11/Makefile.am
deleted file mode 100644
index 43bba78..0000000
--- a/c/src/ada-tests/mptests/mp11/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-_SUBDIRS = node1 node2
-
-include $(top_srcdir)/../../../testsuites/automake/subdirs.am
-include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp12/Makefile.am b/c/src/ada-tests/mptests/mp12/Makefile.am
deleted file mode 100644
index 43bba78..0000000
--- a/c/src/ada-tests/mptests/mp12/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-_SUBDIRS = node1 node2
-
-include $(top_srcdir)/../../../testsuites/automake/subdirs.am
-include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp13/Makefile.am b/c/src/ada-tests/mptests/mp13/Makefile.am
deleted file mode 100644
index 43bba78..0000000
--- a/c/src/ada-tests/mptests/mp13/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-_SUBDIRS = node1 node2
-
-include $(top_srcdir)/../../../testsuites/automake/subdirs.am
-include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp14/Makefile.am b/c/src/ada-tests/mptests/mp14/Makefile.am
deleted file mode 100644
index 43bba78..0000000
--- a/c/src/ada-tests/mptests/mp14/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-_SUBDIRS = node1 node2
-
-include $(top_srcdir)/../../../testsuites/automake/subdirs.am
-include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/configure.ac b/c/src/configure.ac
index d228b5e..0ef63ce 100644
--- a/c/src/configure.ac
+++ b/c/src/configure.ac
@@ -153,15 +153,6 @@ AC_ARG_ENABLE([ada],
   *)  AC_MSG_ERROR(bad value ${enable_ada} for --enable-ada) ;;
 esac],[enable_ada=no])
 
-RTEMS_BSP_CONFIG_SUBDIR(
-  [ada-tests],[ada-tests],
-  ['--enable-rtems-root=../' \
-   '--enable-project-root=${with_project_root}../$RTEMS_BSP' \
-   '--with-project-top=${with_project_top}../' \
-   '--enable-rtemsbsp=$RTEMS_BSP' \
-  ],
-  [test x"$enable_tests" = xyes && test x"$enable_ada" = xyes])
-
 # HACK ALERT!
 
 # FIXME: Assume multilib implies in-source-tree multilibs
diff --git a/testsuites/ada/Makefile.am b/testsuites/ada/Makefile.am
new file mode 100644
index 0000000..4fdae0c
--- /dev/null
+++ b/testsuites/ada/Makefile.am
@@ -0,0 +1,13 @@
+ACLOCAL_AMFLAGS = -I aclocal -I ../aclocal
+
+_SUBDIRS = support samples sptests tmtests
+if HAS_MP
+_SUBDIRS += mptests
+endif
+
+DIST_SUBDIRS = support samples sptests tmtests mptests
+
+EXTRA_DIST = ada.am
+
+include $(top_srcdir)/../automake/subdirs.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/aclocal/prog-gnat.m4 b/testsuites/ada/aclocal/prog-gnat.m4
similarity index 100%
rename from c/src/ada-tests/aclocal/prog-gnat.m4
rename to testsuites/ada/aclocal/prog-gnat.m4
diff --git a/c/src/ada-tests/ada.am b/testsuites/ada/ada.am
similarity index 100%
rename from c/src/ada-tests/ada.am
rename to testsuites/ada/ada.am
diff --git a/c/src/ada-tests/ada_mvscn b/testsuites/ada/ada_mvscn
similarity index 100%
rename from c/src/ada-tests/ada_mvscn
rename to testsuites/ada/ada_mvscn
diff --git a/c/src/ada-tests/configure.ac b/testsuites/ada/configure.ac
similarity index 98%
rename from c/src/ada-tests/configure.ac
rename to testsuites/ada/configure.ac
index 2f402eb..a929384 100644
--- a/c/src/ada-tests/configure.ac
+++ b/testsuites/ada/configure.ac
@@ -3,7 +3,7 @@
 AC_PREREQ([2.69])
 AC_INIT([rtems-ada-tests],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([support])
-RTEMS_TOP([../../..],[])
+RTEMS_TOP([../..],[..])
 
 RTEMS_CANONICAL_TARGET_CPU
 
@@ -32,8 +32,6 @@ RTEMS_CHECK_TOOL([GNATPREP],[gnatprep],[])
 AM_CONDITIONAL([EXPADA],
   [test x"$enable_expada" = xyes && test x"$HAVE_GNAT" = xyes])
 
-RTEMS_PROJECT_ROOT
-
 AC_SUBST([rtems_ada_testsdir],["\$(libdir)/rtems-][_RTEMS_API][/ada-tests"])
 
 # Explicitly list all Makefiles here
diff --git a/c/src/ada-tests/mptests/Makefile.am b/testsuites/ada/mptests/Makefile.am
similarity index 65%
rename from c/src/ada-tests/mptests/Makefile.am
rename to testsuites/ada/mptests/Makefile.am
index 17999ae..733c9ed 100644
--- a/c/src/ada-tests/mptests/Makefile.am
+++ b/testsuites/ada/mptests/Makefile.am
@@ -13,5 +13,5 @@ _SUBDIRS += mp12
 _SUBDIRS += mp13
 _SUBDIRS += mp14
 
-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/testsuites/ada/mptests/mp01/Makefile.am b/testsuites/ada/mptests/mp01/Makefile.am
new file mode 100644
index 0000000..d1dad53
--- /dev/null
+++ b/testsuites/ada/mptests/mp01/Makefile.am
@@ -0,0 +1,4 @@
+_SUBDIRS = node1 node2
+
+include $(top_srcdir)/../automake/subdirs.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp14/config_base.h b/testsuites/ada/mptests/mp01/config_base.h
similarity index 100%
rename from c/src/ada-tests/mptests/mp14/config_base.h
rename to testsuites/ada/mptests/mp01/config_base.h
diff --git a/c/src/ada-tests/mptests/mp01/mp01.adb b/testsuites/ada/mptests/mp01/mp01.adb
similarity index 100%
rename from c/src/ada-tests/mptests/mp01/mp01.adb
rename to testsuites/ada/mptests/mp01/mp01.adb
diff --git a/c/src/ada-tests/mptests/mp01/mptest.adb b/testsuites/ada/mptests/mp01/mptest.adb
similarity index 100%
rename from c/src/ada-tests/mptests/mp01/mptest.adb
rename to testsuites/ada/mptests/mp01/mptest.adb
diff --git a/c/src/ada-tests/mptests/mp01/mptest.ads b/testsuites/ada/mptests/mp01/mptest.ads
similarity index 100%
rename from c/src/ada-tests/mptests/mp01/mptest.ads
rename to testsuites/ada/mptests/mp01/mptest.ads
diff --git a/c/src/ada-tests/mptests/mp01/node1/Makefile.am b/testsuites/ada/mptests/mp01/node1/Makefile.am
similarity index 80%
rename from c/src/ada-tests/mptests/mp01/node1/Makefile.am
rename to testsuites/ada/mptests/mp01/node1/Makefile.am
index 9a87441..154504a 100644
--- a/c/src/ada-tests/mptests/mp01/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp01/node1/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ mp01_ada_mp01_node1$(EXEEXT): mp01_node1.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp01-node1.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp01/node1/ada_mp01-node1.scn b/testsuites/ada/mptests/mp01/node1/ada_mp01-node1.scn
similarity index 100%
rename from c/src/ada-tests/mptests/mp01/node1/ada_mp01-node1.scn
rename to testsuites/ada/mptests/mp01/node1/ada_mp01-node1.scn
diff --git a/c/src/ada-tests/mptests/mp14/node1/config.h b/testsuites/ada/mptests/mp01/node1/config.h
similarity index 100%
rename from c/src/ada-tests/mptests/mp14/node1/config.h
rename to testsuites/ada/mptests/mp01/node1/config.h
diff --git a/c/src/ada-tests/mptests/mp01/node1/mp01_node1.adb b/testsuites/ada/mptests/mp01/node1/mp01_node1.adb
similarity index 100%
rename from c/src/ada-tests/mptests/mp01/node1/mp01_node1.adb
rename to testsuites/ada/mptests/mp01/node1/mp01_node1.adb
diff --git a/c/src/ada-tests/mptests/mp01/node2/Makefile.am b/testsuites/ada/mptests/mp01/node2/Makefile.am
similarity index 80%
rename from c/src/ada-tests/mptests/mp01/node2/Makefile.am
rename to testsuites/ada/mptests/mp01/node2/Makefile.am
index 1f25556..a58a210 100644
--- a/c/src/ada-tests/mptests/mp01/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp01/node2/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ mp01_ada_mp01_node2$(EXEEXT): mp01_node2.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp01-node2.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp01/node2/ada_mp01-node2.scn b/testsuites/ada/mptests/mp01/node2/ada_mp01-node2.scn
similarity index 100%
rename from c/src/ada-tests/mptests/mp01/node2/ada_mp01-node2.scn
rename to testsuites/ada/mptests/mp01/node2/ada_mp01-node2.scn
diff --git a/c/src/ada-tests/mptests/mp14/node2/config.h b/testsuites/ada/mptests/mp01/node2/config.h
similarity index 100%
rename from c/src/ada-tests/mptests/mp14/node2/config.h
rename to testsuites/ada/mptests/mp01/node2/config.h
diff --git a/c/src/ada-tests/mptests/mp01/node2/mp01_node2.adb b/testsuites/ada/mptests/mp01/node2/mp01_node2.adb
similarity index 100%
rename from c/src/ada-tests/mptests/mp01/node2/mp01_node2.adb
rename to testsuites/ada/mptests/mp01/node2/mp01_node2.adb
diff --git a/testsuites/ada/mptests/mp03/Makefile.am b/testsuites/ada/mptests/mp03/Makefile.am
new file mode 100644
index 0000000..d1dad53
--- /dev/null
+++ b/testsuites/ada/mptests/mp03/Makefile.am
@@ -0,0 +1,4 @@
+_SUBDIRS = node1 node2
+
+include $(top_srcdir)/../automake/subdirs.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp13/config_base.h b/testsuites/ada/mptests/mp03/config_base.h
similarity index 100%
rename from c/src/ada-tests/mptests/mp13/config_base.h
rename to testsuites/ada/mptests/mp03/config_base.h
diff --git a/c/src/ada-tests/mptests/mp03/mptest.adb b/testsuites/ada/mptests/mp03/mptest.adb
similarity index 100%
rename from c/src/ada-tests/mptests/mp03/mptest.adb
rename to testsuites/ada/mptests/mp03/mptest.adb
diff --git a/c/src/ada-tests/mptests/mp03/mptest.ads b/testsuites/ada/mptests/mp03/mptest.ads
similarity index 100%
rename from c/src/ada-tests/mptests/mp03/mptest.ads
rename to testsuites/ada/mptests/mp03/mptest.ads
diff --git a/c/src/ada-tests/mptests/mp03/node1/Makefile.am b/testsuites/ada/mptests/mp03/node1/Makefile.am
similarity index 80%
rename from c/src/ada-tests/mptests/mp03/node1/Makefile.am
rename to testsuites/ada/mptests/mp03/node1/Makefile.am
index 859fdb3..5c9b6f6 100644
--- a/c/src/ada-tests/mptests/mp03/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp03/node1/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ mp03_ada_mp03_node1$(EXEEXT): mp03_node1.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp03-node1.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp03/node1/ada_mp03-node1.scn b/testsuites/ada/mptests/mp03/node1/ada_mp03-node1.scn
similarity index 100%
rename from c/src/ada-tests/mptests/mp03/node1/ada_mp03-node1.scn
rename to testsuites/ada/mptests/mp03/node1/ada_mp03-node1.scn
diff --git a/c/src/ada-tests/mptests/mp13/node1/config.h b/testsuites/ada/mptests/mp03/node1/config.h
similarity index 100%
rename from c/src/ada-tests/mptests/mp13/node1/config.h
rename to testsuites/ada/mptests/mp03/node1/config.h
diff --git a/c/src/ada-tests/mptests/mp03/node1/mp03_node1.adb b/testsuites/ada/mptests/mp03/node1/mp03_node1.adb
similarity index 100%
rename from c/src/ada-tests/mptests/mp03/node1/mp03_node1.adb
rename to testsuites/ada/mptests/mp03/node1/mp03_node1.adb
diff --git a/c/src/ada-tests/mptests/mp03/node2/Makefile.am b/testsuites/ada/mptests/mp03/node2/Makefile.am
similarity index 80%
rename from c/src/ada-tests/mptests/mp03/node2/Makefile.am
rename to testsuites/ada/mptests/mp03/node2/Makefile.am
index b7088eb..bf8b544 100644
--- a/c/src/ada-tests/mptests/mp03/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp03/node2/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ mp03_ada_mp03_node2$(EXEEXT): mp03_node2.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp03-node2.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp03/node2/ada_mp03-node2.scn b/testsuites/ada/mptests/mp03/node2/ada_mp03-node2.scn
similarity index 100%
rename from c/src/ada-tests/mptests/mp03/node2/ada_mp03-node2.scn
rename to testsuites/ada/mptests/mp03/node2/ada_mp03-node2.scn
diff --git a/c/src/ada-tests/mptests/mp13/node2/config.h b/testsuites/ada/mptests/mp03/node2/config.h
similarity index 100%
rename from c/src/ada-tests/mptests/mp13/node2/config.h
rename to testsuites/ada/mptests/mp03/node2/config.h
diff --git a/c/src/ada-tests/mptests/mp03/node2/mp03_node2.adb b/testsuites/ada/mptests/mp03/node2/mp03_node2.adb
similarity index 100%
rename from c/src/ada-tests/mptests/mp03/node2/mp03_node2.adb
rename to testsuites/ada/mptests/mp03/node2/mp03_node2.adb
diff --git a/testsuites/ada/mptests/mp04/Makefile.am b/testsuites/ada/mptests/mp04/Makefile.am
new file mode 100644
index 0000000..d1dad53
--- /dev/null
+++ b/testsuites/ada/mptests/mp04/Makefile.am
@@ -0,0 +1,4 @@
+_SUBDIRS = node1 node2
+
+include $(top_srcdir)/../automake/subdirs.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp12/config_base.h b/testsuites/ada/mptests/mp04/config_base.h
similarity index 100%
rename from c/src/ada-tests/mptests/mp12/config_base.h
rename to testsuites/ada/mptests/mp04/config_base.h
diff --git a/c/src/ada-tests/mptests/mp04/mptest.adb b/testsuites/ada/mptests/mp04/mptest.adb
similarity index 100%
rename from c/src/ada-tests/mptests/mp04/mptest.adb
rename to testsuites/ada/mptests/mp04/mptest.adb
diff --git a/c/src/ada-tests/mptests/mp04/mptest.ads b/testsuites/ada/mptests/mp04/mptest.ads
similarity index 100%
rename from c/src/ada-tests/mptests/mp04/mptest.ads
rename to testsuites/ada/mptests/mp04/mptest.ads
diff --git a/c/src/ada-tests/mptests/mp04/node1/Makefile.am b/testsuites/ada/mptests/mp04/node1/Makefile.am
similarity index 80%
rename from c/src/ada-tests/mptests/mp04/node1/Makefile.am
rename to testsuites/ada/mptests/mp04/node1/Makefile.am
index 221ec1a..633209a 100644
--- a/c/src/ada-tests/mptests/mp04/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp04/node1/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ mp04_ada_mp04_node1$(EXEEXT): mp04_node1.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp04-node1.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp04/node1/ada_mp04-node1.scn b/testsuites/ada/mptests/mp04/node1/ada_mp04-node1.scn
similarity index 100%
rename from c/src/ada-tests/mptests/mp04/node1/ada_mp04-node1.scn
rename to testsuites/ada/mptests/mp04/node1/ada_mp04-node1.scn
diff --git a/c/src/ada-tests/mptests/mp12/node1/config.h b/testsuites/ada/mptests/mp04/node1/config.h
similarity index 100%
rename from c/src/ada-tests/mptests/mp12/node1/config.h
rename to testsuites/ada/mptests/mp04/node1/config.h
diff --git a/c/src/ada-tests/mptests/mp04/node1/mp04_node1.adb b/testsuites/ada/mptests/mp04/node1/mp04_node1.adb
similarity index 100%
rename from c/src/ada-tests/mptests/mp04/node1/mp04_node1.adb
rename to testsuites/ada/mptests/mp04/node1/mp04_node1.adb
diff --git a/c/src/ada-tests/mptests/mp04/node2/Makefile.am b/testsuites/ada/mptests/mp04/node2/Makefile.am
similarity index 80%
rename from c/src/ada-tests/mptests/mp04/node2/Makefile.am
rename to testsuites/ada/mptests/mp04/node2/Makefile.am
index 377564a..cce97cd 100644
--- a/c/src/ada-tests/mptests/mp04/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp04/node2/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ mp04_ada_mp04_node2$(EXEEXT): mp04_node2.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp04-node2.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp04/node2/ada_mp04-node2.scn b/testsuites/ada/mptests/mp04/node2/ada_mp04-node2.scn
similarity index 100%
rename from c/src/ada-tests/mptests/mp04/node2/ada_mp04-node2.scn
rename to testsuites/ada/mptests/mp04/node2/ada_mp04-node2.scn
diff --git a/c/src/ada-tests/mptests/mp12/node2/config.h b/testsuites/ada/mptests/mp04/node2/config.h
similarity index 100%
rename from c/src/ada-tests/mptests/mp12/node2/config.h
rename to testsuites/ada/mptests/mp04/node2/config.h
diff --git a/c/src/ada-tests/mptests/mp04/node2/mp04_node2.adb b/testsuites/ada/mptests/mp04/node2/mp04_node2.adb
similarity index 100%
rename from c/src/ada-tests/mptests/mp04/node2/mp04_node2.adb
rename to testsuites/ada/mptests/mp04/node2/mp04_node2.adb
diff --git a/testsuites/ada/mptests/mp05/Makefile.am b/testsuites/ada/mptests/mp05/Makefile.am
new file mode 100644
index 0000000..d1dad53
--- /dev/null
+++ b/testsuites/ada/mptests/mp05/Makefile.am
@@ -0,0 +1,4 @@
+_SUBDIRS = node1 node2
+
+include $(top_srcdir)/../automake/subdirs.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp11/config_base.h b/testsuites/ada/mptests/mp05/config_base.h
similarity index 100%
rename from c/src/ada-tests/mptests/mp11/config_base.h
rename to testsuites/ada/mptests/mp05/config_base.h
diff --git a/c/src/ada-tests/mptests/mp05/mptest.adb b/testsuites/ada/mptests/mp05/mptest.adb
similarity index 100%
rename from c/src/ada-tests/mptests/mp05/mptest.adb
rename to testsuites/ada/mptests/mp05/mptest.adb
diff --git a/c/src/ada-tests/mptests/mp05/mptest.ads b/testsuites/ada/mptests/mp05/mptest.ads
similarity index 100%
rename from c/src/ada-tests/mptests/mp05/mptest.ads
rename to testsuites/ada/mptests/mp05/mptest.ads
diff --git a/c/src/ada-tests/mptests/mp05/node1/Makefile.am b/testsuites/ada/mptests/mp05/node1/Makefile.am
similarity index 80%
rename from c/src/ada-tests/mptests/mp05/node1/Makefile.am
rename to testsuites/ada/mptests/mp05/node1/Makefile.am
index be025c2..669235e 100644
--- a/c/src/ada-tests/mptests/mp05/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp05/node1/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ mp05_ada_mp05_node1$(EXEEXT): mp05_node1.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp05-node1.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp05/node1/ada_mp05-node1.scn b/testsuites/ada/mptests/mp05/node1/ada_mp05-node1.scn
similarity index 100%
rename from c/src/ada-tests/mptests/mp05/node1/ada_mp05-node1.scn
rename to testsuites/ada/mptests/mp05/node1/ada_mp05-node1.scn
diff --git a/c/src/ada-tests/mptests/mp11/node1/config.h b/testsuites/ada/mptests/mp05/node1/config.h
similarity index 100%
rename from c/src/ada-tests/mptests/mp11/node1/config.h
rename to testsuites/ada/mptests/mp05/node1/config.h
diff --git a/c/src/ada-tests/mptests/mp05/node1/mp05_node1.adb b/testsuites/ada/mptests/mp05/node1/mp05_node1.adb
similarity index 100%
rename from c/src/ada-tests/mptests/mp05/node1/mp05_node1.adb
rename to testsuites/ada/mptests/mp05/node1/mp05_node1.adb
diff --git a/c/src/ada-tests/mptests/mp05/node2/Makefile.am b/testsuites/ada/mptests/mp05/node2/Makefile.am
similarity index 80%
rename from c/src/ada-tests/mptests/mp05/node2/Makefile.am
rename to testsuites/ada/mptests/mp05/node2/Makefile.am
index 8f4be96..15de8d5 100644
--- a/c/src/ada-tests/mptests/mp05/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp05/node2/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ mp05_ada_mp05_node2$(EXEEXT): mp05_node2.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp05-node2.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp05/node2/ada_mp05-node2.scn b/testsuites/ada/mptests/mp05/node2/ada_mp05-node2.scn
similarity index 100%
rename from c/src/ada-tests/mptests/mp05/node2/ada_mp05-node2.scn
rename to testsuites/ada/mptests/mp05/node2/ada_mp05-node2.scn
diff --git a/c/src/ada-tests/mptests/mp11/node2/config.h b/testsuites/ada/mptests/mp05/node2/config.h
similarity index 100%
rename from c/src/ada-tests/mptests/mp11/node2/config.h
rename to testsuites/ada/mptests/mp05/node2/config.h
diff --git a/c/src/ada-tests/mptests/mp05/node2/mp05_node2.adb b/testsuites/ada/mptests/mp05/node2/mp05_node2.adb
similarity index 100%
rename from c/src/ada-tests/mptests/mp05/node2/mp05_node2.adb
rename to testsuites/ada/mptests/mp05/node2/mp05_node2.adb
diff --git a/testsuites/ada/mptests/mp06/Makefile.am b/testsuites/ada/mptests/mp06/Makefile.am
new file mode 100644
index 0000000..d1dad53
--- /dev/null
+++ b/testsuites/ada/mptests/mp06/Makefile.am
@@ -0,0 +1,4 @@
+_SUBDIRS = node1 node2
+
+include $(top_srcdir)/../automake/subdirs.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp10/config_base.h b/testsuites/ada/mptests/mp06/config_base.h
similarity index 100%
rename from c/src/ada-tests/mptests/mp10/config_base.h
rename to testsuites/ada/mptests/mp06/config_base.h
diff --git a/c/src/ada-tests/mptests/mp06/mptest.adb b/testsuites/ada/mptests/mp06/mptest.adb
similarity index 100%
rename from c/src/ada-tests/mptests/mp06/mptest.adb
rename to testsuites/ada/mptests/mp06/mptest.adb
diff --git a/c/src/ada-tests/mptests/mp06/mptest.ads b/testsuites/ada/mptests/mp06/mptest.ads
similarity index 100%
rename from c/src/ada-tests/mptests/mp06/mptest.ads
rename to testsuites/ada/mptests/mp06/mptest.ads
diff --git a/c/src/ada-tests/mptests/mp06/node1/Makefile.am b/testsuites/ada/mptests/mp06/node1/Makefile.am
similarity index 80%
rename from c/src/ada-tests/mptests/mp06/node1/Makefile.am
rename to testsuites/ada/mptests/mp06/node1/Makefile.am
index d5e2cd3..45bde9a 100644
--- a/c/src/ada-tests/mptests/mp06/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp06/node1/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ mp06_ada_mp06_node1$(EXEEXT): mp06_node1.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp06-node1.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp06/node1/ada_mp06-node1.scn b/testsuites/ada/mptests/mp06/node1/ada_mp06-node1.scn
similarity index 100%
rename from c/src/ada-tests/mptests/mp06/node1/ada_mp06-node1.scn
rename to testsuites/ada/mptests/mp06/node1/ada_mp06-node1.scn
diff --git a/c/src/ada-tests/mptests/mp10/node1/config.h b/testsuites/ada/mptests/mp06/node1/config.h
similarity index 100%
rename from c/src/ada-tests/mptests/mp10/node1/config.h
rename to testsuites/ada/mptests/mp06/node1/config.h
diff --git a/c/src/ada-tests/mptests/mp06/node1/mp06_node1.adb b/testsuites/ada/mptests/mp06/node1/mp06_node1.adb
similarity index 100%
rename from c/src/ada-tests/mptests/mp06/node1/mp06_node1.adb
rename to testsuites/ada/mptests/mp06/node1/mp06_node1.adb
diff --git a/c/src/ada-tests/mptests/mp06/node2/Makefile.am b/testsuites/ada/mptests/mp06/node2/Makefile.am
similarity index 80%
rename from c/src/ada-tests/mptests/mp06/node2/Makefile.am
rename to testsuites/ada/mptests/mp06/node2/Makefile.am
index 47c3d13..e16512e 100644
--- a/c/src/ada-tests/mptests/mp06/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp06/node2/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ mp06_ada_mp06_node2$(EXEEXT): mp06_node2.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp06-node2.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp06/node2/ada_mp06-node2.scn b/testsuites/ada/mptests/mp06/node2/ada_mp06-node2.scn
similarity index 100%
rename from c/src/ada-tests/mptests/mp06/node2/ada_mp06-node2.scn
rename to testsuites/ada/mptests/mp06/node2/ada_mp06-node2.scn
diff --git a/c/src/ada-tests/mptests/mp10/node2/config.h b/testsuites/ada/mptests/mp06/node2/config.h
similarity index 100%
rename from c/src/ada-tests/mptests/mp10/node2/config.h
rename to testsuites/ada/mptests/mp06/node2/config.h
diff --git a/c/src/ada-tests/mptests/mp06/node2/mp06_node2.adb b/testsuites/ada/mptests/mp06/node2/mp06_node2.adb
similarity index 100%
rename from c/src/ada-tests/mptests/mp06/node2/mp06_node2.adb
rename to testsuites/ada/mptests/mp06/node2/mp06_node2.adb
diff --git a/testsuites/ada/mptests/mp07/Makefile.am b/testsuites/ada/mptests/mp07/Makefile.am
new file mode 100644
index 0000000..d1dad53
--- /dev/null
+++ b/testsuites/ada/mptests/mp07/Makefile.am
@@ -0,0 +1,4 @@
+_SUBDIRS = node1 node2
+
+include $(top_srcdir)/../automake/subdirs.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp09/config_base.h b/testsuites/ada/mptests/mp07/config_base.h
similarity index 100%
rename from c/src/ada-tests/mptests/mp09/config_base.h
rename to testsuites/ada/mptests/mp07/config_base.h
diff --git a/c/src/ada-tests/mptests/mp07/mptest.adb b/testsuites/ada/mptests/mp07/mptest.adb
similarity index 100%
rename from c/src/ada-tests/mptests/mp07/mptest.adb
rename to testsuites/ada/mptests/mp07/mptest.adb
diff --git a/c/src/ada-tests/mptests/mp07/mptest.ads b/testsuites/ada/mptests/mp07/mptest.ads
similarity index 100%
rename from c/src/ada-tests/mptests/mp07/mptest.ads
rename to testsuites/ada/mptests/mp07/mptest.ads
diff --git a/c/src/ada-tests/mptests/mp07/node1/Makefile.am b/testsuites/ada/mptests/mp07/node1/Makefile.am
similarity index 80%
rename from c/src/ada-tests/mptests/mp07/node1/Makefile.am
rename to testsuites/ada/mptests/mp07/node1/Makefile.am
index 540e28f..c6b77cd 100644
--- a/c/src/ada-tests/mptests/mp07/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp07/node1/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ mp07_ada_mp07_node1$(EXEEXT): mp07_node1.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp07-node1.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp07/node1/ada_mp07-node1.scn b/testsuites/ada/mptests/mp07/node1/ada_mp07-node1.scn
similarity index 100%
rename from c/src/ada-tests/mptests/mp07/node1/ada_mp07-node1.scn
rename to testsuites/ada/mptests/mp07/node1/ada_mp07-node1.scn
diff --git a/c/src/ada-tests/mptests/mp09/node1/config.h b/testsuites/ada/mptests/mp07/node1/config.h
similarity index 100%
rename from c/src/ada-tests/mptests/mp09/node1/config.h
rename to testsuites/ada/mptests/mp07/node1/config.h
diff --git a/c/src/ada-tests/mptests/mp07/node1/mp07_node1.adb b/testsuites/ada/mptests/mp07/node1/mp07_node1.adb
similarity index 100%
rename from c/src/ada-tests/mptests/mp07/node1/mp07_node1.adb
rename to testsuites/ada/mptests/mp07/node1/mp07_node1.adb
diff --git a/c/src/ada-tests/mptests/mp07/node2/Makefile.am b/testsuites/ada/mptests/mp07/node2/Makefile.am
similarity index 80%
rename from c/src/ada-tests/mptests/mp07/node2/Makefile.am
rename to testsuites/ada/mptests/mp07/node2/Makefile.am
index 9ef989f..95e3108 100644
--- a/c/src/ada-tests/mptests/mp07/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp07/node2/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ mp07_ada_mp07_node2$(EXEEXT): mp07_node2.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp07-node2.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp07/node2/ada_mp07-node2.scn b/testsuites/ada/mptests/mp07/node2/ada_mp07-node2.scn
similarity index 100%
rename from c/src/ada-tests/mptests/mp07/node2/ada_mp07-node2.scn
rename to testsuites/ada/mptests/mp07/node2/ada_mp07-node2.scn
diff --git a/c/src/ada-tests/mptests/mp09/node2/config.h b/testsuites/ada/mptests/mp07/node2/config.h
similarity index 100%
rename from c/src/ada-tests/mptests/mp09/node2/config.h
rename to testsuites/ada/mptests/mp07/node2/config.h
diff --git a/c/src/ada-tests/mptests/mp07/node2/mp07_node2.adb b/testsuites/ada/mptests/mp07/node2/mp07_node2.adb
similarity index 100%
rename from c/src/ada-tests/mptests/mp07/node2/mp07_node2.adb
rename to testsuites/ada/mptests/mp07/node2/mp07_node2.adb
diff --git a/testsuites/ada/mptests/mp08/Makefile.am b/testsuites/ada/mptests/mp08/Makefile.am
new file mode 100644
index 0000000..d1dad53
--- /dev/null
+++ b/testsuites/ada/mptests/mp08/Makefile.am
@@ -0,0 +1,4 @@
+_SUBDIRS = node1 node2
+
+include $(top_srcdir)/../automake/subdirs.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp08/config_base.h b/testsuites/ada/mptests/mp08/config_base.h
similarity index 100%
rename from c/src/ada-tests/mptests/mp08/config_base.h
rename to testsuites/ada/mptests/mp08/config_base.h
diff --git a/c/src/ada-tests/mptests/mp08/mptest.adb b/testsuites/ada/mptests/mp08/mptest.adb
similarity index 100%
rename from c/src/ada-tests/mptests/mp08/mptest.adb
rename to testsuites/ada/mptests/mp08/mptest.adb
diff --git a/c/src/ada-tests/mptests/mp08/mptest.ads b/testsuites/ada/mptests/mp08/mptest.ads
similarity index 100%
rename from c/src/ada-tests/mptests/mp08/mptest.ads
rename to testsuites/ada/mptests/mp08/mptest.ads
diff --git a/c/src/ada-tests/mptests/mp08/node1/Makefile.am b/testsuites/ada/mptests/mp08/node1/Makefile.am
similarity index 80%
rename from c/src/ada-tests/mptests/mp08/node1/Makefile.am
rename to testsuites/ada/mptests/mp08/node1/Makefile.am
index 4e007f2..be1b6ce 100644
--- a/c/src/ada-tests/mptests/mp08/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp08/node1/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ mp08_ada_mp08_node1$(EXEEXT): mp08_node1.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp08-node1.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp08/node1/ada_mp08-node1.scn b/testsuites/ada/mptests/mp08/node1/ada_mp08-node1.scn
similarity index 100%
rename from c/src/ada-tests/mptests/mp08/node1/ada_mp08-node1.scn
rename to testsuites/ada/mptests/mp08/node1/ada_mp08-node1.scn
diff --git a/c/src/ada-tests/mptests/mp08/node1/config.h b/testsuites/ada/mptests/mp08/node1/config.h
similarity index 100%
rename from c/src/ada-tests/mptests/mp08/node1/config.h
rename to testsuites/ada/mptests/mp08/node1/config.h
diff --git a/c/src/ada-tests/mptests/mp08/node1/mp08_node1.adb b/testsuites/ada/mptests/mp08/node1/mp08_node1.adb
similarity index 100%
rename from c/src/ada-tests/mptests/mp08/node1/mp08_node1.adb
rename to testsuites/ada/mptests/mp08/node1/mp08_node1.adb
diff --git a/c/src/ada-tests/mptests/mp08/node2/Makefile.am b/testsuites/ada/mptests/mp08/node2/Makefile.am
similarity index 80%
rename from c/src/ada-tests/mptests/mp08/node2/Makefile.am
rename to testsuites/ada/mptests/mp08/node2/Makefile.am
index 5a804c3..1a3271d 100644
--- a/c/src/ada-tests/mptests/mp08/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp08/node2/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ mp08_ada_mp08_node2$(EXEEXT): mp08_node2.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp08-node2.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp08/node2/ada_mp08-node2.scn b/testsuites/ada/mptests/mp08/node2/ada_mp08-node2.scn
similarity index 100%
rename from c/src/ada-tests/mptests/mp08/node2/ada_mp08-node2.scn
rename to testsuites/ada/mptests/mp08/node2/ada_mp08-node2.scn
diff --git a/c/src/ada-tests/mptests/mp08/node2/config.h b/testsuites/ada/mptests/mp08/node2/config.h
similarity index 100%
rename from c/src/ada-tests/mptests/mp08/node2/config.h
rename to testsuites/ada/mptests/mp08/node2/config.h
diff --git a/c/src/ada-tests/mptests/mp08/node2/mp08_node2.adb b/testsuites/ada/mptests/mp08/node2/mp08_node2.adb
similarity index 100%
rename from c/src/ada-tests/mptests/mp08/node2/mp08_node2.adb
rename to testsuites/ada/mptests/mp08/node2/mp08_node2.adb
diff --git a/testsuites/ada/mptests/mp09/Makefile.am b/testsuites/ada/mptests/mp09/Makefile.am
new file mode 100644
index 0000000..d1dad53
--- /dev/null
+++ b/testsuites/ada/mptests/mp09/Makefile.am
@@ -0,0 +1,4 @@
+_SUBDIRS = node1 node2
+
+include $(top_srcdir)/../automake/subdirs.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp07/config_base.h b/testsuites/ada/mptests/mp09/config_base.h
similarity index 100%
rename from c/src/ada-tests/mptests/mp07/config_base.h
rename to testsuites/ada/mptests/mp09/config_base.h
diff --git a/c/src/ada-tests/mptests/mp09/mptest.adb b/testsuites/ada/mptests/mp09/mptest.adb
similarity index 100%
rename from c/src/ada-tests/mptests/mp09/mptest.adb
rename to testsuites/ada/mptests/mp09/mptest.adb
diff --git a/c/src/ada-tests/mptests/mp09/mptest.ads b/testsuites/ada/mptests/mp09/mptest.ads
similarity index 100%
rename from c/src/ada-tests/mptests/mp09/mptest.ads
rename to testsuites/ada/mptests/mp09/mptest.ads
diff --git a/c/src/ada-tests/mptests/mp09/node1/Makefile.am b/testsuites/ada/mptests/mp09/node1/Makefile.am
similarity index 80%
rename from c/src/ada-tests/mptests/mp09/node1/Makefile.am
rename to testsuites/ada/mptests/mp09/node1/Makefile.am
index bf40a63..54e4418 100644
--- a/c/src/ada-tests/mptests/mp09/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp09/node1/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ mp09_ada_mp09_node1$(EXEEXT): mp09_node1.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp09-node1.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp09/node1/ada_mp09-node1.scn b/testsuites/ada/mptests/mp09/node1/ada_mp09-node1.scn
similarity index 100%
rename from c/src/ada-tests/mptests/mp09/node1/ada_mp09-node1.scn
rename to testsuites/ada/mptests/mp09/node1/ada_mp09-node1.scn
diff --git a/c/src/ada-tests/mptests/mp07/node1/config.h b/testsuites/ada/mptests/mp09/node1/config.h
similarity index 100%
rename from c/src/ada-tests/mptests/mp07/node1/config.h
rename to testsuites/ada/mptests/mp09/node1/config.h
diff --git a/c/src/ada-tests/mptests/mp09/node1/mp09_node1.adb b/testsuites/ada/mptests/mp09/node1/mp09_node1.adb
similarity index 100%
rename from c/src/ada-tests/mptests/mp09/node1/mp09_node1.adb
rename to testsuites/ada/mptests/mp09/node1/mp09_node1.adb
diff --git a/c/src/ada-tests/mptests/mp09/node2/Makefile.am b/testsuites/ada/mptests/mp09/node2/Makefile.am
similarity index 80%
rename from c/src/ada-tests/mptests/mp09/node2/Makefile.am
rename to testsuites/ada/mptests/mp09/node2/Makefile.am
index b4b631c..e2ec626 100644
--- a/c/src/ada-tests/mptests/mp09/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp09/node2/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ mp09_ada_mp09_node2$(EXEEXT): mp09_node2.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp09-node2.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp09/node2/ada_mp09-node2.scn b/testsuites/ada/mptests/mp09/node2/ada_mp09-node2.scn
similarity index 100%
rename from c/src/ada-tests/mptests/mp09/node2/ada_mp09-node2.scn
rename to testsuites/ada/mptests/mp09/node2/ada_mp09-node2.scn
diff --git a/c/src/ada-tests/mptests/mp07/node2/config.h b/testsuites/ada/mptests/mp09/node2/config.h
similarity index 100%
rename from c/src/ada-tests/mptests/mp07/node2/config.h
rename to testsuites/ada/mptests/mp09/node2/config.h
diff --git a/c/src/ada-tests/mptests/mp09/node2/mp09_node2.adb b/testsuites/ada/mptests/mp09/node2/mp09_node2.adb
similarity index 100%
rename from c/src/ada-tests/mptests/mp09/node2/mp09_node2.adb
rename to testsuites/ada/mptests/mp09/node2/mp09_node2.adb
diff --git a/testsuites/ada/mptests/mp10/Makefile.am b/testsuites/ada/mptests/mp10/Makefile.am
new file mode 100644
index 0000000..d1dad53
--- /dev/null
+++ b/testsuites/ada/mptests/mp10/Makefile.am
@@ -0,0 +1,4 @@
+_SUBDIRS = node1 node2
+
+include $(top_srcdir)/../automake/subdirs.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp06/config_base.h b/testsuites/ada/mptests/mp10/config_base.h
similarity index 100%
rename from c/src/ada-tests/mptests/mp06/config_base.h
rename to testsuites/ada/mptests/mp10/config_base.h
diff --git a/c/src/ada-tests/mptests/mp10/mptest.adb b/testsuites/ada/mptests/mp10/mptest.adb
similarity index 100%
rename from c/src/ada-tests/mptests/mp10/mptest.adb
rename to testsuites/ada/mptests/mp10/mptest.adb
diff --git a/c/src/ada-tests/mptests/mp10/mptest.ads b/testsuites/ada/mptests/mp10/mptest.ads
similarity index 100%
rename from c/src/ada-tests/mptests/mp10/mptest.ads
rename to testsuites/ada/mptests/mp10/mptest.ads
diff --git a/c/src/ada-tests/mptests/mp10/node1/Makefile.am b/testsuites/ada/mptests/mp10/node1/Makefile.am
similarity index 80%
rename from c/src/ada-tests/mptests/mp10/node1/Makefile.am
rename to testsuites/ada/mptests/mp10/node1/Makefile.am
index 49a7ead..f682f32 100644
--- a/c/src/ada-tests/mptests/mp10/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp10/node1/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ mp10_ada_mp10_node1$(EXEEXT): mp10_node1.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp10-node1.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp10/node1/ada_mp10-node1.scn b/testsuites/ada/mptests/mp10/node1/ada_mp10-node1.scn
similarity index 100%
rename from c/src/ada-tests/mptests/mp10/node1/ada_mp10-node1.scn
rename to testsuites/ada/mptests/mp10/node1/ada_mp10-node1.scn
diff --git a/c/src/ada-tests/mptests/mp06/node1/config.h b/testsuites/ada/mptests/mp10/node1/config.h
similarity index 100%
rename from c/src/ada-tests/mptests/mp06/node1/config.h
rename to testsuites/ada/mptests/mp10/node1/config.h
diff --git a/c/src/ada-tests/mptests/mp10/node1/mp10_node1.adb b/testsuites/ada/mptests/mp10/node1/mp10_node1.adb
similarity index 100%
rename from c/src/ada-tests/mptests/mp10/node1/mp10_node1.adb
rename to testsuites/ada/mptests/mp10/node1/mp10_node1.adb
diff --git a/c/src/ada-tests/mptests/mp10/node2/Makefile.am b/testsuites/ada/mptests/mp10/node2/Makefile.am
similarity index 80%
rename from c/src/ada-tests/mptests/mp10/node2/Makefile.am
rename to testsuites/ada/mptests/mp10/node2/Makefile.am
index 11e8f53..cc6335b 100644
--- a/c/src/ada-tests/mptests/mp10/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp10/node2/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ mp10_ada_mp10_node2$(EXEEXT): mp10_node2.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp10-node2.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp10/node2/ada_mp10-node2.scn b/testsuites/ada/mptests/mp10/node2/ada_mp10-node2.scn
similarity index 100%
rename from c/src/ada-tests/mptests/mp10/node2/ada_mp10-node2.scn
rename to testsuites/ada/mptests/mp10/node2/ada_mp10-node2.scn
diff --git a/c/src/ada-tests/mptests/mp06/node2/config.h b/testsuites/ada/mptests/mp10/node2/config.h
similarity index 100%
rename from c/src/ada-tests/mptests/mp06/node2/config.h
rename to testsuites/ada/mptests/mp10/node2/config.h
diff --git a/c/src/ada-tests/mptests/mp10/node2/mp10_node2.adb b/testsuites/ada/mptests/mp10/node2/mp10_node2.adb
similarity index 100%
rename from c/src/ada-tests/mptests/mp10/node2/mp10_node2.adb
rename to testsuites/ada/mptests/mp10/node2/mp10_node2.adb
diff --git a/testsuites/ada/mptests/mp11/Makefile.am b/testsuites/ada/mptests/mp11/Makefile.am
new file mode 100644
index 0000000..d1dad53
--- /dev/null
+++ b/testsuites/ada/mptests/mp11/Makefile.am
@@ -0,0 +1,4 @@
+_SUBDIRS = node1 node2
+
+include $(top_srcdir)/../automake/subdirs.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp05/config_base.h b/testsuites/ada/mptests/mp11/config_base.h
similarity index 100%
rename from c/src/ada-tests/mptests/mp05/config_base.h
rename to testsuites/ada/mptests/mp11/config_base.h
diff --git a/c/src/ada-tests/mptests/mp11/mptest.adb b/testsuites/ada/mptests/mp11/mptest.adb
similarity index 100%
rename from c/src/ada-tests/mptests/mp11/mptest.adb
rename to testsuites/ada/mptests/mp11/mptest.adb
diff --git a/c/src/ada-tests/mptests/mp11/mptest.ads b/testsuites/ada/mptests/mp11/mptest.ads
similarity index 100%
rename from c/src/ada-tests/mptests/mp11/mptest.ads
rename to testsuites/ada/mptests/mp11/mptest.ads
diff --git a/c/src/ada-tests/mptests/mp11/node1/Makefile.am b/testsuites/ada/mptests/mp11/node1/Makefile.am
similarity index 80%
rename from c/src/ada-tests/mptests/mp11/node1/Makefile.am
rename to testsuites/ada/mptests/mp11/node1/Makefile.am
index e791c4f..0511699 100644
--- a/c/src/ada-tests/mptests/mp11/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp11/node1/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ mp11_ada_mp11_node1$(EXEEXT): mp11_node1.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp11-node1.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp11/node1/ada_mp11-node1.scn b/testsuites/ada/mptests/mp11/node1/ada_mp11-node1.scn
similarity index 100%
rename from c/src/ada-tests/mptests/mp11/node1/ada_mp11-node1.scn
rename to testsuites/ada/mptests/mp11/node1/ada_mp11-node1.scn
diff --git a/c/src/ada-tests/mptests/mp05/node1/config.h b/testsuites/ada/mptests/mp11/node1/config.h
similarity index 100%
rename from c/src/ada-tests/mptests/mp05/node1/config.h
rename to testsuites/ada/mptests/mp11/node1/config.h
diff --git a/c/src/ada-tests/mptests/mp11/node1/mp11_node1.adb b/testsuites/ada/mptests/mp11/node1/mp11_node1.adb
similarity index 100%
rename from c/src/ada-tests/mptests/mp11/node1/mp11_node1.adb
rename to testsuites/ada/mptests/mp11/node1/mp11_node1.adb
diff --git a/c/src/ada-tests/mptests/mp11/node2/Makefile.am b/testsuites/ada/mptests/mp11/node2/Makefile.am
similarity index 80%
rename from c/src/ada-tests/mptests/mp11/node2/Makefile.am
rename to testsuites/ada/mptests/mp11/node2/Makefile.am
index a216808..7055fcc 100644
--- a/c/src/ada-tests/mptests/mp11/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp11/node2/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ mp11_ada_mp11_node2$(EXEEXT): mp11_node2.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp11-node2.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp11/node2/ada_mp11-node2.scn b/testsuites/ada/mptests/mp11/node2/ada_mp11-node2.scn
similarity index 100%
rename from c/src/ada-tests/mptests/mp11/node2/ada_mp11-node2.scn
rename to testsuites/ada/mptests/mp11/node2/ada_mp11-node2.scn
diff --git a/c/src/ada-tests/mptests/mp05/node2/config.h b/testsuites/ada/mptests/mp11/node2/config.h
similarity index 100%
rename from c/src/ada-tests/mptests/mp05/node2/config.h
rename to testsuites/ada/mptests/mp11/node2/config.h
diff --git a/c/src/ada-tests/mptests/mp11/node2/mp11_node2.adb b/testsuites/ada/mptests/mp11/node2/mp11_node2.adb
similarity index 100%
rename from c/src/ada-tests/mptests/mp11/node2/mp11_node2.adb
rename to testsuites/ada/mptests/mp11/node2/mp11_node2.adb
diff --git a/testsuites/ada/mptests/mp12/Makefile.am b/testsuites/ada/mptests/mp12/Makefile.am
new file mode 100644
index 0000000..d1dad53
--- /dev/null
+++ b/testsuites/ada/mptests/mp12/Makefile.am
@@ -0,0 +1,4 @@
+_SUBDIRS = node1 node2
+
+include $(top_srcdir)/../automake/subdirs.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp04/config_base.h b/testsuites/ada/mptests/mp12/config_base.h
similarity index 100%
rename from c/src/ada-tests/mptests/mp04/config_base.h
rename to testsuites/ada/mptests/mp12/config_base.h
diff --git a/c/src/ada-tests/mptests/mp12/mptest.adb b/testsuites/ada/mptests/mp12/mptest.adb
similarity index 100%
rename from c/src/ada-tests/mptests/mp12/mptest.adb
rename to testsuites/ada/mptests/mp12/mptest.adb
diff --git a/c/src/ada-tests/mptests/mp12/mptest.ads b/testsuites/ada/mptests/mp12/mptest.ads
similarity index 100%
rename from c/src/ada-tests/mptests/mp12/mptest.ads
rename to testsuites/ada/mptests/mp12/mptest.ads
diff --git a/c/src/ada-tests/mptests/mp12/node1/Makefile.am b/testsuites/ada/mptests/mp12/node1/Makefile.am
similarity index 80%
rename from c/src/ada-tests/mptests/mp12/node1/Makefile.am
rename to testsuites/ada/mptests/mp12/node1/Makefile.am
index 22eb8b7..9daa6a0 100644
--- a/c/src/ada-tests/mptests/mp12/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp12/node1/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ mp12_ada_mp12_node1$(EXEEXT): mp12_node1.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp12-node1.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp12/node1/ada_mp12-node1.scn b/testsuites/ada/mptests/mp12/node1/ada_mp12-node1.scn
similarity index 100%
rename from c/src/ada-tests/mptests/mp12/node1/ada_mp12-node1.scn
rename to testsuites/ada/mptests/mp12/node1/ada_mp12-node1.scn
diff --git a/c/src/ada-tests/mptests/mp04/node1/config.h b/testsuites/ada/mptests/mp12/node1/config.h
similarity index 100%
rename from c/src/ada-tests/mptests/mp04/node1/config.h
rename to testsuites/ada/mptests/mp12/node1/config.h
diff --git a/c/src/ada-tests/mptests/mp12/node1/mp12_node1.adb b/testsuites/ada/mptests/mp12/node1/mp12_node1.adb
similarity index 100%
rename from c/src/ada-tests/mptests/mp12/node1/mp12_node1.adb
rename to testsuites/ada/mptests/mp12/node1/mp12_node1.adb
diff --git a/c/src/ada-tests/mptests/mp12/node2/Makefile.am b/testsuites/ada/mptests/mp12/node2/Makefile.am
similarity index 80%
rename from c/src/ada-tests/mptests/mp12/node2/Makefile.am
rename to testsuites/ada/mptests/mp12/node2/Makefile.am
index 889f100..b3e8df3 100644
--- a/c/src/ada-tests/mptests/mp12/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp12/node2/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ mp12_ada_mp12_node2$(EXEEXT): mp12_node2.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp12-node2.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp12/node2/ada_mp12-node2.scn b/testsuites/ada/mptests/mp12/node2/ada_mp12-node2.scn
similarity index 100%
rename from c/src/ada-tests/mptests/mp12/node2/ada_mp12-node2.scn
rename to testsuites/ada/mptests/mp12/node2/ada_mp12-node2.scn
diff --git a/c/src/ada-tests/mptests/mp04/node2/config.h b/testsuites/ada/mptests/mp12/node2/config.h
similarity index 100%
rename from c/src/ada-tests/mptests/mp04/node2/config.h
rename to testsuites/ada/mptests/mp12/node2/config.h
diff --git a/c/src/ada-tests/mptests/mp12/node2/mp12_node2.adb b/testsuites/ada/mptests/mp12/node2/mp12_node2.adb
similarity index 100%
rename from c/src/ada-tests/mptests/mp12/node2/mp12_node2.adb
rename to testsuites/ada/mptests/mp12/node2/mp12_node2.adb
diff --git a/testsuites/ada/mptests/mp13/Makefile.am b/testsuites/ada/mptests/mp13/Makefile.am
new file mode 100644
index 0000000..d1dad53
--- /dev/null
+++ b/testsuites/ada/mptests/mp13/Makefile.am
@@ -0,0 +1,4 @@
+_SUBDIRS = node1 node2
+
+include $(top_srcdir)/../automake/subdirs.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp03/config_base.h b/testsuites/ada/mptests/mp13/config_base.h
similarity index 100%
rename from c/src/ada-tests/mptests/mp03/config_base.h
rename to testsuites/ada/mptests/mp13/config_base.h
diff --git a/c/src/ada-tests/mptests/mp13/mptest.adb b/testsuites/ada/mptests/mp13/mptest.adb
similarity index 100%
rename from c/src/ada-tests/mptests/mp13/mptest.adb
rename to testsuites/ada/mptests/mp13/mptest.adb
diff --git a/c/src/ada-tests/mptests/mp13/mptest.ads b/testsuites/ada/mptests/mp13/mptest.ads
similarity index 100%
rename from c/src/ada-tests/mptests/mp13/mptest.ads
rename to testsuites/ada/mptests/mp13/mptest.ads
diff --git a/c/src/ada-tests/mptests/mp13/node1/Makefile.am b/testsuites/ada/mptests/mp13/node1/Makefile.am
similarity index 80%
rename from c/src/ada-tests/mptests/mp13/node1/Makefile.am
rename to testsuites/ada/mptests/mp13/node1/Makefile.am
index aa80acd..bf641ce 100644
--- a/c/src/ada-tests/mptests/mp13/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp13/node1/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ mp13_ada_mp13_node1$(EXEEXT): mp13_node1.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp13-node1.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp13/node1/ada_mp13-node1.scn b/testsuites/ada/mptests/mp13/node1/ada_mp13-node1.scn
similarity index 100%
rename from c/src/ada-tests/mptests/mp13/node1/ada_mp13-node1.scn
rename to testsuites/ada/mptests/mp13/node1/ada_mp13-node1.scn
diff --git a/c/src/ada-tests/mptests/mp03/node1/config.h b/testsuites/ada/mptests/mp13/node1/config.h
similarity index 100%
rename from c/src/ada-tests/mptests/mp03/node1/config.h
rename to testsuites/ada/mptests/mp13/node1/config.h
diff --git a/c/src/ada-tests/mptests/mp13/node1/mp13_node1.adb b/testsuites/ada/mptests/mp13/node1/mp13_node1.adb
similarity index 100%
rename from c/src/ada-tests/mptests/mp13/node1/mp13_node1.adb
rename to testsuites/ada/mptests/mp13/node1/mp13_node1.adb
diff --git a/c/src/ada-tests/mptests/mp13/node2/Makefile.am b/testsuites/ada/mptests/mp13/node2/Makefile.am
similarity index 80%
rename from c/src/ada-tests/mptests/mp13/node2/Makefile.am
rename to testsuites/ada/mptests/mp13/node2/Makefile.am
index c28ec60..95e9798 100644
--- a/c/src/ada-tests/mptests/mp13/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp13/node2/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ mp13_ada_mp13_node2$(EXEEXT): mp13_node2.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp13-node2.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp13/node2/ada_mp13-node2.scn b/testsuites/ada/mptests/mp13/node2/ada_mp13-node2.scn
similarity index 100%
rename from c/src/ada-tests/mptests/mp13/node2/ada_mp13-node2.scn
rename to testsuites/ada/mptests/mp13/node2/ada_mp13-node2.scn
diff --git a/c/src/ada-tests/mptests/mp03/node2/config.h b/testsuites/ada/mptests/mp13/node2/config.h
similarity index 100%
rename from c/src/ada-tests/mptests/mp03/node2/config.h
rename to testsuites/ada/mptests/mp13/node2/config.h
diff --git a/c/src/ada-tests/mptests/mp13/node2/mp13_node2.adb b/testsuites/ada/mptests/mp13/node2/mp13_node2.adb
similarity index 100%
rename from c/src/ada-tests/mptests/mp13/node2/mp13_node2.adb
rename to testsuites/ada/mptests/mp13/node2/mp13_node2.adb
diff --git a/testsuites/ada/mptests/mp14/Makefile.am b/testsuites/ada/mptests/mp14/Makefile.am
new file mode 100644
index 0000000..d1dad53
--- /dev/null
+++ b/testsuites/ada/mptests/mp14/Makefile.am
@@ -0,0 +1,4 @@
+_SUBDIRS = node1 node2
+
+include $(top_srcdir)/../automake/subdirs.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp01/config_base.h b/testsuites/ada/mptests/mp14/config_base.h
similarity index 100%
rename from c/src/ada-tests/mptests/mp01/config_base.h
rename to testsuites/ada/mptests/mp14/config_base.h
diff --git a/c/src/ada-tests/mptests/mp14/mptest.adb b/testsuites/ada/mptests/mp14/mptest.adb
similarity index 100%
rename from c/src/ada-tests/mptests/mp14/mptest.adb
rename to testsuites/ada/mptests/mp14/mptest.adb
diff --git a/c/src/ada-tests/mptests/mp14/mptest.ads b/testsuites/ada/mptests/mp14/mptest.ads
similarity index 100%
rename from c/src/ada-tests/mptests/mp14/mptest.ads
rename to testsuites/ada/mptests/mp14/mptest.ads
diff --git a/c/src/ada-tests/mptests/mp14/node1/Makefile.am b/testsuites/ada/mptests/mp14/node1/Makefile.am
similarity index 80%
rename from c/src/ada-tests/mptests/mp14/node1/Makefile.am
rename to testsuites/ada/mptests/mp14/node1/Makefile.am
index 0dc8f8b..6e2a212 100644
--- a/c/src/ada-tests/mptests/mp14/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp14/node1/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ mp14_ada_mp14_node1$(EXEEXT): mp14_node1.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp14-node1.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp14/node1/ada_mp14-node1.scn b/testsuites/ada/mptests/mp14/node1/ada_mp14-node1.scn
similarity index 100%
rename from c/src/ada-tests/mptests/mp14/node1/ada_mp14-node1.scn
rename to testsuites/ada/mptests/mp14/node1/ada_mp14-node1.scn
diff --git a/c/src/ada-tests/mptests/mp01/node1/config.h b/testsuites/ada/mptests/mp14/node1/config.h
similarity index 100%
rename from c/src/ada-tests/mptests/mp01/node1/config.h
rename to testsuites/ada/mptests/mp14/node1/config.h
diff --git a/c/src/ada-tests/mptests/mp14/node1/mp14_node1.adb b/testsuites/ada/mptests/mp14/node1/mp14_node1.adb
similarity index 100%
rename from c/src/ada-tests/mptests/mp14/node1/mp14_node1.adb
rename to testsuites/ada/mptests/mp14/node1/mp14_node1.adb
diff --git a/c/src/ada-tests/mptests/mp14/node2/Makefile.am b/testsuites/ada/mptests/mp14/node2/Makefile.am
similarity index 80%
rename from c/src/ada-tests/mptests/mp14/node2/Makefile.am
rename to testsuites/ada/mptests/mp14/node2/Makefile.am
index 30d2cf8..b694774 100644
--- a/c/src/ada-tests/mptests/mp14/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp14/node2/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -16,4 +16,4 @@ mp14_ada_mp14_node2$(EXEEXT): mp14_node2.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp14-node2.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/mptests/mp14/node2/ada_mp14-node2.scn b/testsuites/ada/mptests/mp14/node2/ada_mp14-node2.scn
similarity index 100%
rename from c/src/ada-tests/mptests/mp14/node2/ada_mp14-node2.scn
rename to testsuites/ada/mptests/mp14/node2/ada_mp14-node2.scn
diff --git a/c/src/ada-tests/mptests/mp01/node2/config.h b/testsuites/ada/mptests/mp14/node2/config.h
similarity index 100%
rename from c/src/ada-tests/mptests/mp01/node2/config.h
rename to testsuites/ada/mptests/mp14/node2/config.h
diff --git a/c/src/ada-tests/mptests/mp14/node2/mp14_node2.adb b/testsuites/ada/mptests/mp14/node2/mp14_node2.adb
similarity index 100%
rename from c/src/ada-tests/mptests/mp14/node2/mp14_node2.adb
rename to testsuites/ada/mptests/mp14/node2/mp14_node2.adb
diff --git a/c/src/ada-tests/samples/Makefile.am b/testsuites/ada/samples/Makefile.am
similarity index 50%
rename from c/src/ada-tests/samples/Makefile.am
rename to testsuites/ada/samples/Makefile.am
index c41a4b4..0aa25af 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
similarity index 66%
rename from c/src/ada-tests/samples/base_mp/Makefile.am
rename to testsuites/ada/samples/base_mp/Makefile.am
index caf05e5..ed05ebb 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 at .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
similarity index 100%
rename from c/src/ada-tests/samples/base_mp/config.h
rename to 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
similarity index 100%
rename from c/src/ada-tests/samples/base_mp/mptest.adb
rename to 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
similarity index 100%
rename from c/src/ada-tests/samples/base_mp/mptest.ads
rename to 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
similarity index 79%
rename from c/src/ada-tests/samples/base_mp/node1/Makefile.am
rename to testsuites/ada/samples/base_mp/node1/Makefile.am
index 5307665..c6ec8cd 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 at .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
similarity index 100%
rename from c/src/ada-tests/samples/base_mp/node1/ada_base_mp-node1.scn
rename to 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
similarity index 79%
rename from c/src/ada-tests/samples/base_mp/node2/Makefile.am
rename to testsuites/ada/samples/base_mp/node2/Makefile.am
index efc208b..9095902 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 at .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
similarity index 100%
rename from c/src/ada-tests/samples/base_mp/node2/ada_base_mp-node2.scn
rename to 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
similarity index 76%
rename from c/src/ada-tests/samples/base_sp/Makefile.am
rename to testsuites/ada/samples/base_sp/Makefile.am
index 6575f06..c6b2628 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 at .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
similarity index 100%
rename from c/src/ada-tests/samples/base_sp/ada_base_sp.scn
rename to 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
similarity index 100%
rename from c/src/ada-tests/samples/base_sp/base_sp.adb
rename to 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
similarity index 100%
rename from c/src/ada-tests/samples/base_sp/config.h
rename to 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
similarity index 100%
rename from c/src/ada-tests/samples/base_sp/sptest.adb
rename to 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
similarity index 100%
rename from c/src/ada-tests/samples/base_sp/sptest.ads
rename to 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
similarity index 75%
rename from c/src/ada-tests/samples/hello/Makefile.am
rename to testsuites/ada/samples/hello/Makefile.am
index ff4b51c..9a6aa5e 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 at .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
similarity index 100%
rename from c/src/ada-tests/samples/hello/ada_hello.scn
rename to testsuites/ada/samples/hello/ada_hello.scn
diff --git a/c/src/ada-tests/sptests/spname01/config.h b/testsuites/ada/samples/hello/config.h
similarity index 100%
rename from c/src/ada-tests/sptests/spname01/config.h
rename to testsuites/ada/samples/hello/config.h
diff --git a/c/src/ada-tests/samples/hello/hello.adb b/testsuites/ada/samples/hello/hello.adb
similarity index 100%
rename from c/src/ada-tests/samples/hello/hello.adb
rename to testsuites/ada/samples/hello/hello.adb
diff --git a/c/src/ada-tests/samples/hello/sptest.adb b/testsuites/ada/samples/hello/sptest.adb
similarity index 100%
rename from c/src/ada-tests/samples/hello/sptest.adb
rename to testsuites/ada/samples/hello/sptest.adb
diff --git a/c/src/ada-tests/samples/hello/sptest.ads b/testsuites/ada/samples/hello/sptest.ads
similarity index 100%
rename from c/src/ada-tests/samples/hello/sptest.ads
rename to testsuites/ada/samples/hello/sptest.ads
diff --git a/c/src/ada-tests/samples/nsecs/Makefile.am b/testsuites/ada/samples/nsecs/Makefile.am
similarity index 75%
rename from c/src/ada-tests/samples/nsecs/Makefile.am
rename to testsuites/ada/samples/nsecs/Makefile.am
index bc8dd2a..64a8145 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 at .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
similarity index 100%
rename from c/src/ada-tests/samples/nsecs/ada_nsecs.scn
rename to 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
similarity index 100%
rename from c/src/ada-tests/samples/nsecs/config.h
rename to testsuites/ada/samples/nsecs/config.h
diff --git a/c/src/ada-tests/samples/nsecs/nsecs.adb b/testsuites/ada/samples/nsecs/nsecs.adb
similarity index 100%
rename from c/src/ada-tests/samples/nsecs/nsecs.adb
rename to testsuites/ada/samples/nsecs/nsecs.adb
diff --git a/c/src/ada-tests/samples/nsecs/sptest.adb b/testsuites/ada/samples/nsecs/sptest.adb
similarity index 100%
rename from c/src/ada-tests/samples/nsecs/sptest.adb
rename to testsuites/ada/samples/nsecs/sptest.adb
diff --git a/c/src/ada-tests/samples/nsecs/sptest.ads b/testsuites/ada/samples/nsecs/sptest.ads
similarity index 100%
rename from c/src/ada-tests/samples/nsecs/sptest.ads
rename to testsuites/ada/samples/nsecs/sptest.ads
diff --git a/c/src/ada-tests/samples/ticker/Makefile.am b/testsuites/ada/samples/ticker/Makefile.am
similarity index 76%
rename from c/src/ada-tests/samples/ticker/Makefile.am
rename to testsuites/ada/samples/ticker/Makefile.am
index b21d6c4..1259458 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 at .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
similarity index 100%
rename from c/src/ada-tests/samples/ticker/ada_ticker.scn
rename to testsuites/ada/samples/ticker/ada_ticker.scn
diff --git a/c/src/ada-tests/sptests/sp02/config.h b/testsuites/ada/samples/ticker/config.h
similarity index 100%
rename from c/src/ada-tests/sptests/sp02/config.h
rename to testsuites/ada/samples/ticker/config.h
diff --git a/c/src/ada-tests/samples/ticker/sptest.adb b/testsuites/ada/samples/ticker/sptest.adb
similarity index 100%
rename from c/src/ada-tests/samples/ticker/sptest.adb
rename to testsuites/ada/samples/ticker/sptest.adb
diff --git a/c/src/ada-tests/sptests/sp01/sptest.ads b/testsuites/ada/samples/ticker/sptest.ads
similarity index 100%
rename from c/src/ada-tests/sptests/sp01/sptest.ads
rename to testsuites/ada/samples/ticker/sptest.ads
diff --git a/c/src/ada-tests/samples/ticker/ticker.adb b/testsuites/ada/samples/ticker/ticker.adb
similarity index 100%
rename from c/src/ada-tests/samples/ticker/ticker.adb
rename to testsuites/ada/samples/ticker/ticker.adb
diff --git a/c/src/ada-tests/sptests/Makefile.am b/testsuites/ada/sptests/Makefile.am
similarity index 77%
rename from c/src/ada-tests/sptests/Makefile.am
rename to testsuites/ada/sptests/Makefile.am
index 7edeb6f..fda256f 100644
--- a/c/src/ada-tests/sptests/Makefile.am
+++ b/testsuites/ada/sptests/Makefile.am
@@ -24,5 +24,5 @@ _SUBDIRS += sp25
 _SUBDIRS += spname01
 _SUBDIRS += spatcb01
 
-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/sptests/sp01/Makefile.am b/testsuites/ada/sptests/sp01/Makefile.am
similarity index 74%
rename from c/src/ada-tests/sptests/sp01/Makefile.am
rename to testsuites/ada/sptests/sp01/Makefile.am
index fbbc837..0fc6a6d 100644
--- a/c/src/ada-tests/sptests/sp01/Makefile.am
+++ b/testsuites/ada/sptests/sp01/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -13,4 +13,4 @@ ada_sp01$(EXEEXT): sp01.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp01.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/sptests/sp01/ada_sp01.scn b/testsuites/ada/sptests/sp01/ada_sp01.scn
similarity index 100%
rename from c/src/ada-tests/sptests/sp01/ada_sp01.scn
rename to testsuites/ada/sptests/sp01/ada_sp01.scn
diff --git a/c/src/ada-tests/sptests/sp01/config.h b/testsuites/ada/sptests/sp01/config.h
similarity index 100%
rename from c/src/ada-tests/sptests/sp01/config.h
rename to testsuites/ada/sptests/sp01/config.h
diff --git a/c/src/ada-tests/sptests/sp01/sp01.adb b/testsuites/ada/sptests/sp01/sp01.adb
similarity index 100%
rename from c/src/ada-tests/sptests/sp01/sp01.adb
rename to testsuites/ada/sptests/sp01/sp01.adb
diff --git a/c/src/ada-tests/sptests/sp01/sptest.adb b/testsuites/ada/sptests/sp01/sptest.adb
similarity index 100%
rename from c/src/ada-tests/sptests/sp01/sptest.adb
rename to testsuites/ada/sptests/sp01/sptest.adb
diff --git a/c/src/ada-tests/samples/ticker/sptest.ads b/testsuites/ada/sptests/sp01/sptest.ads
similarity index 100%
rename from c/src/ada-tests/samples/ticker/sptest.ads
rename to testsuites/ada/sptests/sp01/sptest.ads
diff --git a/c/src/ada-tests/sptests/sp02/Makefile.am b/testsuites/ada/sptests/sp02/Makefile.am
similarity index 74%
rename from c/src/ada-tests/sptests/sp02/Makefile.am
rename to testsuites/ada/sptests/sp02/Makefile.am
index d23a4e6..7e68120 100644
--- a/c/src/ada-tests/sptests/sp02/Makefile.am
+++ b/testsuites/ada/sptests/sp02/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -13,4 +13,4 @@ ada_sp02$(EXEEXT): sp02.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp02.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/sptests/sp02/ada_sp02.scn b/testsuites/ada/sptests/sp02/ada_sp02.scn
similarity index 100%
rename from c/src/ada-tests/sptests/sp02/ada_sp02.scn
rename to testsuites/ada/sptests/sp02/ada_sp02.scn
diff --git a/c/src/ada-tests/samples/ticker/config.h b/testsuites/ada/sptests/sp02/config.h
similarity index 100%
rename from c/src/ada-tests/samples/ticker/config.h
rename to testsuites/ada/sptests/sp02/config.h
diff --git a/c/src/ada-tests/sptests/sp02/sp02.adb b/testsuites/ada/sptests/sp02/sp02.adb
similarity index 100%
rename from c/src/ada-tests/sptests/sp02/sp02.adb
rename to testsuites/ada/sptests/sp02/sp02.adb
diff --git a/c/src/ada-tests/sptests/sp02/sptest.adb b/testsuites/ada/sptests/sp02/sptest.adb
similarity index 100%
rename from c/src/ada-tests/sptests/sp02/sptest.adb
rename to testsuites/ada/sptests/sp02/sptest.adb
diff --git a/c/src/ada-tests/sptests/sp02/sptest.ads b/testsuites/ada/sptests/sp02/sptest.ads
similarity index 100%
rename from c/src/ada-tests/sptests/sp02/sptest.ads
rename to testsuites/ada/sptests/sp02/sptest.ads
diff --git a/c/src/ada-tests/sptests/sp03/Makefile.am b/testsuites/ada/sptests/sp03/Makefile.am
similarity index 74%
rename from c/src/ada-tests/sptests/sp03/Makefile.am
rename to testsuites/ada/sptests/sp03/Makefile.am
index cdb256c..9a7ccfa 100644
--- a/c/src/ada-tests/sptests/sp03/Makefile.am
+++ b/testsuites/ada/sptests/sp03/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -13,4 +13,4 @@ ada_sp03$(EXEEXT): sp03.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp03.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/sptests/sp03/ada_sp03.scn b/testsuites/ada/sptests/sp03/ada_sp03.scn
similarity index 100%
rename from c/src/ada-tests/sptests/sp03/ada_sp03.scn
rename to testsuites/ada/sptests/sp03/ada_sp03.scn
diff --git a/c/src/ada-tests/sptests/sp03/config.h b/testsuites/ada/sptests/sp03/config.h
similarity index 100%
rename from c/src/ada-tests/sptests/sp03/config.h
rename to testsuites/ada/sptests/sp03/config.h
diff --git a/c/src/ada-tests/sptests/sp03/sp03.adb b/testsuites/ada/sptests/sp03/sp03.adb
similarity index 100%
rename from c/src/ada-tests/sptests/sp03/sp03.adb
rename to testsuites/ada/sptests/sp03/sp03.adb
diff --git a/c/src/ada-tests/sptests/sp03/sptest.adb b/testsuites/ada/sptests/sp03/sptest.adb
similarity index 100%
rename from c/src/ada-tests/sptests/sp03/sptest.adb
rename to testsuites/ada/sptests/sp03/sptest.adb
diff --git a/c/src/ada-tests/sptests/sp03/sptest.ads b/testsuites/ada/sptests/sp03/sptest.ads
similarity index 100%
rename from c/src/ada-tests/sptests/sp03/sptest.ads
rename to testsuites/ada/sptests/sp03/sptest.ads
diff --git a/c/src/ada-tests/sptests/sp04/Makefile.am b/testsuites/ada/sptests/sp04/Makefile.am
similarity index 74%
rename from c/src/ada-tests/sptests/sp04/Makefile.am
rename to testsuites/ada/sptests/sp04/Makefile.am
index cbc8cf2..fc5d2be 100644
--- a/c/src/ada-tests/sptests/sp04/Makefile.am
+++ b/testsuites/ada/sptests/sp04/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -13,4 +13,4 @@ ada_sp04$(EXEEXT): sp04.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp04.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/sptests/sp04/README b/testsuites/ada/sptests/sp04/README
similarity index 100%
rename from c/src/ada-tests/sptests/sp04/README
rename to testsuites/ada/sptests/sp04/README
diff --git a/c/src/ada-tests/sptests/sp04/ada_sp04.scn b/testsuites/ada/sptests/sp04/ada_sp04.scn
similarity index 100%
rename from c/src/ada-tests/sptests/sp04/ada_sp04.scn
rename to testsuites/ada/sptests/sp04/ada_sp04.scn
diff --git a/c/src/ada-tests/sptests/sp04/config.h b/testsuites/ada/sptests/sp04/config.h
similarity index 100%
rename from c/src/ada-tests/sptests/sp04/config.h
rename to testsuites/ada/sptests/sp04/config.h
diff --git a/c/src/ada-tests/sptests/sp04/sp04.adb b/testsuites/ada/sptests/sp04/sp04.adb
similarity index 100%
rename from c/src/ada-tests/sptests/sp04/sp04.adb
rename to testsuites/ada/sptests/sp04/sp04.adb
diff --git a/c/src/ada-tests/sptests/sp04/sptest.adb b/testsuites/ada/sptests/sp04/sptest.adb
similarity index 100%
rename from c/src/ada-tests/sptests/sp04/sptest.adb
rename to testsuites/ada/sptests/sp04/sptest.adb
diff --git a/c/src/ada-tests/sptests/sp04/sptest.ads b/testsuites/ada/sptests/sp04/sptest.ads
similarity index 100%
rename from c/src/ada-tests/sptests/sp04/sptest.ads
rename to testsuites/ada/sptests/sp04/sptest.ads
diff --git a/c/src/ada-tests/sptests/sp05/Makefile.am b/testsuites/ada/sptests/sp05/Makefile.am
similarity index 74%
rename from c/src/ada-tests/sptests/sp05/Makefile.am
rename to testsuites/ada/sptests/sp05/Makefile.am
index c66d419..d206e1b 100644
--- a/c/src/ada-tests/sptests/sp05/Makefile.am
+++ b/testsuites/ada/sptests/sp05/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -13,4 +13,4 @@ ada_sp05$(EXEEXT): sp05.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp05.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/sptests/sp05/ada_sp05.scn b/testsuites/ada/sptests/sp05/ada_sp05.scn
similarity index 100%
rename from c/src/ada-tests/sptests/sp05/ada_sp05.scn
rename to testsuites/ada/sptests/sp05/ada_sp05.scn
diff --git a/c/src/ada-tests/sptests/sp06/config.h b/testsuites/ada/sptests/sp05/config.h
similarity index 100%
rename from c/src/ada-tests/sptests/sp06/config.h
rename to testsuites/ada/sptests/sp05/config.h
diff --git a/c/src/ada-tests/sptests/sp05/sp05.adb b/testsuites/ada/sptests/sp05/sp05.adb
similarity index 100%
rename from c/src/ada-tests/sptests/sp05/sp05.adb
rename to testsuites/ada/sptests/sp05/sp05.adb
diff --git a/c/src/ada-tests/sptests/sp05/sptest.adb b/testsuites/ada/sptests/sp05/sptest.adb
similarity index 100%
rename from c/src/ada-tests/sptests/sp05/sptest.adb
rename to testsuites/ada/sptests/sp05/sptest.adb
diff --git a/c/src/ada-tests/sptests/sp05/sptest.ads b/testsuites/ada/sptests/sp05/sptest.ads
similarity index 100%
rename from c/src/ada-tests/sptests/sp05/sptest.ads
rename to testsuites/ada/sptests/sp05/sptest.ads
diff --git a/c/src/ada-tests/sptests/sp06/Makefile.am b/testsuites/ada/sptests/sp06/Makefile.am
similarity index 74%
rename from c/src/ada-tests/sptests/sp06/Makefile.am
rename to testsuites/ada/sptests/sp06/Makefile.am
index 538e093..145423b 100644
--- a/c/src/ada-tests/sptests/sp06/Makefile.am
+++ b/testsuites/ada/sptests/sp06/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -13,4 +13,4 @@ ada_sp06$(EXEEXT): sp06.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp06.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/sptests/sp06/ada_sp06.scn b/testsuites/ada/sptests/sp06/ada_sp06.scn
similarity index 100%
rename from c/src/ada-tests/sptests/sp06/ada_sp06.scn
rename to testsuites/ada/sptests/sp06/ada_sp06.scn
diff --git a/c/src/ada-tests/sptests/sp05/config.h b/testsuites/ada/sptests/sp06/config.h
similarity index 100%
rename from c/src/ada-tests/sptests/sp05/config.h
rename to testsuites/ada/sptests/sp06/config.h
diff --git a/c/src/ada-tests/sptests/sp06/sp06.adb b/testsuites/ada/sptests/sp06/sp06.adb
similarity index 100%
rename from c/src/ada-tests/sptests/sp06/sp06.adb
rename to testsuites/ada/sptests/sp06/sp06.adb
diff --git a/c/src/ada-tests/sptests/sp06/sptest.adb b/testsuites/ada/sptests/sp06/sptest.adb
similarity index 100%
rename from c/src/ada-tests/sptests/sp06/sptest.adb
rename to testsuites/ada/sptests/sp06/sptest.adb
diff --git a/c/src/ada-tests/sptests/sp06/sptest.ads b/testsuites/ada/sptests/sp06/sptest.ads
similarity index 100%
rename from c/src/ada-tests/sptests/sp06/sptest.ads
rename to testsuites/ada/sptests/sp06/sptest.ads
diff --git a/c/src/ada-tests/sptests/sp07/Makefile.am b/testsuites/ada/sptests/sp07/Makefile.am
similarity index 74%
rename from c/src/ada-tests/sptests/sp07/Makefile.am
rename to testsuites/ada/sptests/sp07/Makefile.am
index 52c9379..076b97d 100644
--- a/c/src/ada-tests/sptests/sp07/Makefile.am
+++ b/testsuites/ada/sptests/sp07/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -14,4 +14,4 @@ ada_sp07$(EXEEXT): sp07.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp07.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/sptests/sp07/ada_sp07.scn b/testsuites/ada/sptests/sp07/ada_sp07.scn
similarity index 100%
rename from c/src/ada-tests/sptests/sp07/ada_sp07.scn
rename to testsuites/ada/sptests/sp07/ada_sp07.scn
diff --git a/c/src/ada-tests/sptests/sp07/config.h b/testsuites/ada/sptests/sp07/config.h
similarity index 100%
rename from c/src/ada-tests/sptests/sp07/config.h
rename to testsuites/ada/sptests/sp07/config.h
diff --git a/c/src/ada-tests/sptests/sp07/sp07.adb b/testsuites/ada/sptests/sp07/sp07.adb
similarity index 100%
rename from c/src/ada-tests/sptests/sp07/sp07.adb
rename to testsuites/ada/sptests/sp07/sp07.adb
diff --git a/c/src/ada-tests/sptests/sp07/sptest.adb b/testsuites/ada/sptests/sp07/sptest.adb
similarity index 100%
rename from c/src/ada-tests/sptests/sp07/sptest.adb
rename to testsuites/ada/sptests/sp07/sptest.adb
diff --git a/c/src/ada-tests/sptests/sp07/sptest.ads b/testsuites/ada/sptests/sp07/sptest.ads
similarity index 100%
rename from c/src/ada-tests/sptests/sp07/sptest.ads
rename to testsuites/ada/sptests/sp07/sptest.ads
diff --git a/c/src/ada-tests/sptests/sp08/Makefile.am b/testsuites/ada/sptests/sp08/Makefile.am
similarity index 74%
rename from c/src/ada-tests/sptests/sp08/Makefile.am
rename to testsuites/ada/sptests/sp08/Makefile.am
index 1514bd3..5c6fc3e 100644
--- a/c/src/ada-tests/sptests/sp08/Makefile.am
+++ b/testsuites/ada/sptests/sp08/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -13,4 +13,4 @@ ada_sp08$(EXEEXT): sp08.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp08.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/sptests/sp08/ada_sp08.scn b/testsuites/ada/sptests/sp08/ada_sp08.scn
similarity index 100%
rename from c/src/ada-tests/sptests/sp08/ada_sp08.scn
rename to testsuites/ada/sptests/sp08/ada_sp08.scn
diff --git a/c/src/ada-tests/sptests/sp08/config.h b/testsuites/ada/sptests/sp08/config.h
similarity index 100%
rename from c/src/ada-tests/sptests/sp08/config.h
rename to testsuites/ada/sptests/sp08/config.h
diff --git a/c/src/ada-tests/sptests/sp08/sp08.adb b/testsuites/ada/sptests/sp08/sp08.adb
similarity index 100%
rename from c/src/ada-tests/sptests/sp08/sp08.adb
rename to testsuites/ada/sptests/sp08/sp08.adb
diff --git a/c/src/ada-tests/sptests/sp08/sptest.adb b/testsuites/ada/sptests/sp08/sptest.adb
similarity index 100%
rename from c/src/ada-tests/sptests/sp08/sptest.adb
rename to testsuites/ada/sptests/sp08/sptest.adb
diff --git a/c/src/ada-tests/sptests/sp08/sptest.ads b/testsuites/ada/sptests/sp08/sptest.ads
similarity index 100%
rename from c/src/ada-tests/sptests/sp08/sptest.ads
rename to testsuites/ada/sptests/sp08/sptest.ads
diff --git a/c/src/ada-tests/sptests/sp09/Makefile.am b/testsuites/ada/sptests/sp09/Makefile.am
similarity index 79%
rename from c/src/ada-tests/sptests/sp09/Makefile.am
rename to testsuites/ada/sptests/sp09/Makefile.am
index ba4edeb..8956a38 100644
--- a/c/src/ada-tests/sptests/sp09/Makefile.am
+++ b/testsuites/ada/sptests/sp09/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -18,4 +18,4 @@ ada_sp09$(EXEEXT): sp09.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp09.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/sptests/sp09/ada_sp09.scn b/testsuites/ada/sptests/sp09/ada_sp09.scn
similarity index 100%
rename from c/src/ada-tests/sptests/sp09/ada_sp09.scn
rename to testsuites/ada/sptests/sp09/ada_sp09.scn
diff --git a/c/src/ada-tests/sptests/sp09/config.h b/testsuites/ada/sptests/sp09/config.h
similarity index 100%
rename from c/src/ada-tests/sptests/sp09/config.h
rename to testsuites/ada/sptests/sp09/config.h
diff --git a/c/src/ada-tests/sptests/sp09/sp09.adb b/testsuites/ada/sptests/sp09/sp09.adb
similarity index 100%
rename from c/src/ada-tests/sptests/sp09/sp09.adb
rename to testsuites/ada/sptests/sp09/sp09.adb
diff --git a/c/src/ada-tests/sptests/sp09/sptest.adb b/testsuites/ada/sptests/sp09/sptest.adb
similarity index 100%
rename from c/src/ada-tests/sptests/sp09/sptest.adb
rename to testsuites/ada/sptests/sp09/sptest.adb
diff --git a/c/src/ada-tests/sptests/sp09/sptest.ads b/testsuites/ada/sptests/sp09/sptest.ads
similarity index 100%
rename from c/src/ada-tests/sptests/sp09/sptest.ads
rename to testsuites/ada/sptests/sp09/sptest.ads
diff --git a/c/src/ada-tests/sptests/sp11/Makefile.am b/testsuites/ada/sptests/sp11/Makefile.am
similarity index 74%
rename from c/src/ada-tests/sptests/sp11/Makefile.am
rename to testsuites/ada/sptests/sp11/Makefile.am
index 5c7cd28..ec4ded6 100644
--- a/c/src/ada-tests/sptests/sp11/Makefile.am
+++ b/testsuites/ada/sptests/sp11/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -13,4 +13,4 @@ ada_sp11$(EXEEXT): sp11.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp11.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/sptests/sp11/ada_sp11.scn b/testsuites/ada/sptests/sp11/ada_sp11.scn
similarity index 100%
rename from c/src/ada-tests/sptests/sp11/ada_sp11.scn
rename to testsuites/ada/sptests/sp11/ada_sp11.scn
diff --git a/c/src/ada-tests/sptests/sp11/config.h b/testsuites/ada/sptests/sp11/config.h
similarity index 100%
rename from c/src/ada-tests/sptests/sp11/config.h
rename to testsuites/ada/sptests/sp11/config.h
diff --git a/c/src/ada-tests/sptests/sp11/sp11.adb b/testsuites/ada/sptests/sp11/sp11.adb
similarity index 100%
rename from c/src/ada-tests/sptests/sp11/sp11.adb
rename to testsuites/ada/sptests/sp11/sp11.adb
diff --git a/c/src/ada-tests/sptests/sp11/sptest.adb b/testsuites/ada/sptests/sp11/sptest.adb
similarity index 100%
rename from c/src/ada-tests/sptests/sp11/sptest.adb
rename to testsuites/ada/sptests/sp11/sptest.adb
diff --git a/c/src/ada-tests/sptests/sp11/sptest.ads b/testsuites/ada/sptests/sp11/sptest.ads
similarity index 100%
rename from c/src/ada-tests/sptests/sp11/sptest.ads
rename to testsuites/ada/sptests/sp11/sptest.ads
diff --git a/c/src/ada-tests/sptests/sp12/Makefile.am b/testsuites/ada/sptests/sp12/Makefile.am
similarity index 74%
rename from c/src/ada-tests/sptests/sp12/Makefile.am
rename to testsuites/ada/sptests/sp12/Makefile.am
index 33c5e08..0a99682 100644
--- a/c/src/ada-tests/sptests/sp12/Makefile.am
+++ b/testsuites/ada/sptests/sp12/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -13,4 +13,4 @@ ada_sp12$(EXEEXT): sp12.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp12.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/sptests/sp12/ada_sp12.scn b/testsuites/ada/sptests/sp12/ada_sp12.scn
similarity index 100%
rename from c/src/ada-tests/sptests/sp12/ada_sp12.scn
rename to testsuites/ada/sptests/sp12/ada_sp12.scn
diff --git a/c/src/ada-tests/sptests/sp12/config.h b/testsuites/ada/sptests/sp12/config.h
similarity index 100%
rename from c/src/ada-tests/sptests/sp12/config.h
rename to testsuites/ada/sptests/sp12/config.h
diff --git a/c/src/ada-tests/sptests/sp12/sp12.adb b/testsuites/ada/sptests/sp12/sp12.adb
similarity index 100%
rename from c/src/ada-tests/sptests/sp12/sp12.adb
rename to testsuites/ada/sptests/sp12/sp12.adb
diff --git a/c/src/ada-tests/sptests/sp12/sptest.adb b/testsuites/ada/sptests/sp12/sptest.adb
similarity index 100%
rename from c/src/ada-tests/sptests/sp12/sptest.adb
rename to testsuites/ada/sptests/sp12/sptest.adb
diff --git a/c/src/ada-tests/sptests/sp12/sptest.ads b/testsuites/ada/sptests/sp12/sptest.ads
similarity index 100%
rename from c/src/ada-tests/sptests/sp12/sptest.ads
rename to testsuites/ada/sptests/sp12/sptest.ads
diff --git a/c/src/ada-tests/sptests/sp13/Makefile.am b/testsuites/ada/sptests/sp13/Makefile.am
similarity index 74%
rename from c/src/ada-tests/sptests/sp13/Makefile.am
rename to testsuites/ada/sptests/sp13/Makefile.am
index f54587f..19a8ed2 100644
--- a/c/src/ada-tests/sptests/sp13/Makefile.am
+++ b/testsuites/ada/sptests/sp13/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -13,4 +13,4 @@ ada_sp13$(EXEEXT): sp13.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp13.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/sptests/sp13/ada_sp13.scn b/testsuites/ada/sptests/sp13/ada_sp13.scn
similarity index 100%
rename from c/src/ada-tests/sptests/sp13/ada_sp13.scn
rename to testsuites/ada/sptests/sp13/ada_sp13.scn
diff --git a/c/src/ada-tests/sptests/sp13/config.h b/testsuites/ada/sptests/sp13/config.h
similarity index 100%
rename from c/src/ada-tests/sptests/sp13/config.h
rename to testsuites/ada/sptests/sp13/config.h
diff --git a/c/src/ada-tests/sptests/sp13/sp13.adb b/testsuites/ada/sptests/sp13/sp13.adb
similarity index 100%
rename from c/src/ada-tests/sptests/sp13/sp13.adb
rename to testsuites/ada/sptests/sp13/sp13.adb
diff --git a/c/src/ada-tests/sptests/sp13/sptest.adb b/testsuites/ada/sptests/sp13/sptest.adb
similarity index 100%
rename from c/src/ada-tests/sptests/sp13/sptest.adb
rename to testsuites/ada/sptests/sp13/sptest.adb
diff --git a/c/src/ada-tests/sptests/sp13/sptest.ads b/testsuites/ada/sptests/sp13/sptest.ads
similarity index 100%
rename from c/src/ada-tests/sptests/sp13/sptest.ads
rename to testsuites/ada/sptests/sp13/sptest.ads
diff --git a/c/src/ada-tests/sptests/sp14/Makefile.am b/testsuites/ada/sptests/sp14/Makefile.am
similarity index 74%
rename from c/src/ada-tests/sptests/sp14/Makefile.am
rename to testsuites/ada/sptests/sp14/Makefile.am
index dbe01f5..501cd32 100644
--- a/c/src/ada-tests/sptests/sp14/Makefile.am
+++ b/testsuites/ada/sptests/sp14/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -13,4 +13,4 @@ ada_sp14$(EXEEXT): sp14.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp14.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/sptests/sp14/ada_sp14.scn b/testsuites/ada/sptests/sp14/ada_sp14.scn
similarity index 100%
rename from c/src/ada-tests/sptests/sp14/ada_sp14.scn
rename to testsuites/ada/sptests/sp14/ada_sp14.scn
diff --git a/c/src/ada-tests/sptests/sp14/config.h b/testsuites/ada/sptests/sp14/config.h
similarity index 100%
rename from c/src/ada-tests/sptests/sp14/config.h
rename to testsuites/ada/sptests/sp14/config.h
diff --git a/c/src/ada-tests/sptests/sp14/sp14.adb b/testsuites/ada/sptests/sp14/sp14.adb
similarity index 100%
rename from c/src/ada-tests/sptests/sp14/sp14.adb
rename to testsuites/ada/sptests/sp14/sp14.adb
diff --git a/c/src/ada-tests/sptests/sp14/sptest.adb b/testsuites/ada/sptests/sp14/sptest.adb
similarity index 100%
rename from c/src/ada-tests/sptests/sp14/sptest.adb
rename to testsuites/ada/sptests/sp14/sptest.adb
diff --git a/c/src/ada-tests/sptests/sp14/sptest.ads b/testsuites/ada/sptests/sp14/sptest.ads
similarity index 100%
rename from c/src/ada-tests/sptests/sp14/sptest.ads
rename to testsuites/ada/sptests/sp14/sptest.ads
diff --git a/c/src/ada-tests/sptests/sp15/Makefile.am b/testsuites/ada/sptests/sp15/Makefile.am
similarity index 74%
rename from c/src/ada-tests/sptests/sp15/Makefile.am
rename to testsuites/ada/sptests/sp15/Makefile.am
index 5804cda..e1fe83b 100644
--- a/c/src/ada-tests/sptests/sp15/Makefile.am
+++ b/testsuites/ada/sptests/sp15/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -13,4 +13,4 @@ ada_sp15$(EXEEXT): sp15.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp15.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/sptests/sp15/ada_sp15.scn b/testsuites/ada/sptests/sp15/ada_sp15.scn
similarity index 100%
rename from c/src/ada-tests/sptests/sp15/ada_sp15.scn
rename to testsuites/ada/sptests/sp15/ada_sp15.scn
diff --git a/c/src/ada-tests/sptests/sp15/config.h b/testsuites/ada/sptests/sp15/config.h
similarity index 100%
rename from c/src/ada-tests/sptests/sp15/config.h
rename to testsuites/ada/sptests/sp15/config.h
diff --git a/c/src/ada-tests/sptests/sp15/sp15.adb b/testsuites/ada/sptests/sp15/sp15.adb
similarity index 100%
rename from c/src/ada-tests/sptests/sp15/sp15.adb
rename to testsuites/ada/sptests/sp15/sp15.adb
diff --git a/c/src/ada-tests/sptests/sp15/sptest.adb b/testsuites/ada/sptests/sp15/sptest.adb
similarity index 100%
rename from c/src/ada-tests/sptests/sp15/sptest.adb
rename to testsuites/ada/sptests/sp15/sptest.adb
diff --git a/c/src/ada-tests/sptests/sp15/sptest.ads b/testsuites/ada/sptests/sp15/sptest.ads
similarity index 100%
rename from c/src/ada-tests/sptests/sp15/sptest.ads
rename to testsuites/ada/sptests/sp15/sptest.ads
diff --git a/c/src/ada-tests/sptests/sp16/Makefile.am b/testsuites/ada/sptests/sp16/Makefile.am
similarity index 74%
rename from c/src/ada-tests/sptests/sp16/Makefile.am
rename to testsuites/ada/sptests/sp16/Makefile.am
index fc5d075..4959ca2 100644
--- a/c/src/ada-tests/sptests/sp16/Makefile.am
+++ b/testsuites/ada/sptests/sp16/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -13,4 +13,4 @@ ada_sp16$(EXEEXT): sp16.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp16.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/sptests/sp16/ada_sp16.scn b/testsuites/ada/sptests/sp16/ada_sp16.scn
similarity index 100%
rename from c/src/ada-tests/sptests/sp16/ada_sp16.scn
rename to testsuites/ada/sptests/sp16/ada_sp16.scn
diff --git a/c/src/ada-tests/sptests/sp16/config.h b/testsuites/ada/sptests/sp16/config.h
similarity index 100%
rename from c/src/ada-tests/sptests/sp16/config.h
rename to testsuites/ada/sptests/sp16/config.h
diff --git a/c/src/ada-tests/sptests/sp16/sp16.adb b/testsuites/ada/sptests/sp16/sp16.adb
similarity index 100%
rename from c/src/ada-tests/sptests/sp16/sp16.adb
rename to testsuites/ada/sptests/sp16/sp16.adb
diff --git a/c/src/ada-tests/sptests/sp16/sptest.adb b/testsuites/ada/sptests/sp16/sptest.adb
similarity index 100%
rename from c/src/ada-tests/sptests/sp16/sptest.adb
rename to testsuites/ada/sptests/sp16/sptest.adb
diff --git a/c/src/ada-tests/sptests/sp16/sptest.ads b/testsuites/ada/sptests/sp16/sptest.ads
similarity index 100%
rename from c/src/ada-tests/sptests/sp16/sptest.ads
rename to testsuites/ada/sptests/sp16/sptest.ads
diff --git a/c/src/ada-tests/sptests/sp17/Makefile.am b/testsuites/ada/sptests/sp17/Makefile.am
similarity index 74%
rename from c/src/ada-tests/sptests/sp17/Makefile.am
rename to testsuites/ada/sptests/sp17/Makefile.am
index 7b20338..9a5b2a3 100644
--- a/c/src/ada-tests/sptests/sp17/Makefile.am
+++ b/testsuites/ada/sptests/sp17/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -13,4 +13,4 @@ ada_sp17$(EXEEXT): sp17.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp17.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/sptests/sp17/ada_sp17.scn b/testsuites/ada/sptests/sp17/ada_sp17.scn
similarity index 100%
rename from c/src/ada-tests/sptests/sp17/ada_sp17.scn
rename to testsuites/ada/sptests/sp17/ada_sp17.scn
diff --git a/c/src/ada-tests/sptests/sp17/config.h b/testsuites/ada/sptests/sp17/config.h
similarity index 100%
rename from c/src/ada-tests/sptests/sp17/config.h
rename to testsuites/ada/sptests/sp17/config.h
diff --git a/c/src/ada-tests/sptests/sp17/sp17.adb b/testsuites/ada/sptests/sp17/sp17.adb
similarity index 100%
rename from c/src/ada-tests/sptests/sp17/sp17.adb
rename to testsuites/ada/sptests/sp17/sp17.adb
diff --git a/c/src/ada-tests/sptests/sp17/sptest.adb b/testsuites/ada/sptests/sp17/sptest.adb
similarity index 100%
rename from c/src/ada-tests/sptests/sp17/sptest.adb
rename to testsuites/ada/sptests/sp17/sptest.adb
diff --git a/c/src/ada-tests/sptests/sp17/sptest.ads b/testsuites/ada/sptests/sp17/sptest.ads
similarity index 100%
rename from c/src/ada-tests/sptests/sp17/sptest.ads
rename to testsuites/ada/sptests/sp17/sptest.ads
diff --git a/c/src/ada-tests/sptests/sp19/Makefile.am b/testsuites/ada/sptests/sp19/Makefile.am
similarity index 77%
rename from c/src/ada-tests/sptests/sp19/Makefile.am
rename to testsuites/ada/sptests/sp19/Makefile.am
index 726b07c..27e7d7c 100644
--- a/c/src/ada-tests/sptests/sp19/Makefile.am
+++ b/testsuites/ada/sptests/sp19/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -17,4 +17,4 @@ ada_sp19$(EXEEXT): sp19.adb sptest.adb sptest.ads init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp19.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/sptests/sp19/README b/testsuites/ada/sptests/sp19/README
similarity index 100%
rename from c/src/ada-tests/sptests/sp19/README
rename to testsuites/ada/sptests/sp19/README
diff --git a/c/src/ada-tests/sptests/sp19/ada_sp19.scn b/testsuites/ada/sptests/sp19/ada_sp19.scn
similarity index 100%
rename from c/src/ada-tests/sptests/sp19/ada_sp19.scn
rename to testsuites/ada/sptests/sp19/ada_sp19.scn
diff --git a/c/src/ada-tests/sptests/sp19/config.h b/testsuites/ada/sptests/sp19/config.h
similarity index 100%
rename from c/src/ada-tests/sptests/sp19/config.h
rename to testsuites/ada/sptests/sp19/config.h
diff --git a/c/src/ada-tests/sptests/sp19/sp19.adb b/testsuites/ada/sptests/sp19/sp19.adb
similarity index 100%
rename from c/src/ada-tests/sptests/sp19/sp19.adb
rename to testsuites/ada/sptests/sp19/sp19.adb
diff --git a/c/src/ada-tests/sptests/sp19/sptest.adp b/testsuites/ada/sptests/sp19/sptest.adp
similarity index 100%
rename from c/src/ada-tests/sptests/sp19/sptest.adp
rename to testsuites/ada/sptests/sp19/sptest.adp
diff --git a/c/src/ada-tests/sptests/sp19/sptest.ads b/testsuites/ada/sptests/sp19/sptest.ads
similarity index 100%
rename from c/src/ada-tests/sptests/sp19/sptest.ads
rename to testsuites/ada/sptests/sp19/sptest.ads
diff --git a/c/src/ada-tests/sptests/sp20/Makefile.am b/testsuites/ada/sptests/sp20/Makefile.am
similarity index 74%
rename from c/src/ada-tests/sptests/sp20/Makefile.am
rename to testsuites/ada/sptests/sp20/Makefile.am
index 24628b8..de7b240 100644
--- a/c/src/ada-tests/sptests/sp20/Makefile.am
+++ b/testsuites/ada/sptests/sp20/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -13,4 +13,4 @@ ada_sp20$(EXEEXT): sp20.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp20.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/sptests/sp20/ada_sp20.scn b/testsuites/ada/sptests/sp20/ada_sp20.scn
similarity index 100%
rename from c/src/ada-tests/sptests/sp20/ada_sp20.scn
rename to testsuites/ada/sptests/sp20/ada_sp20.scn
diff --git a/c/src/ada-tests/sptests/sp20/config.h b/testsuites/ada/sptests/sp20/config.h
similarity index 100%
rename from c/src/ada-tests/sptests/sp20/config.h
rename to testsuites/ada/sptests/sp20/config.h
diff --git a/c/src/ada-tests/sptests/sp20/sp20.adb b/testsuites/ada/sptests/sp20/sp20.adb
similarity index 100%
rename from c/src/ada-tests/sptests/sp20/sp20.adb
rename to testsuites/ada/sptests/sp20/sp20.adb
diff --git a/c/src/ada-tests/sptests/sp20/sptest.adb b/testsuites/ada/sptests/sp20/sptest.adb
similarity index 100%
rename from c/src/ada-tests/sptests/sp20/sptest.adb
rename to testsuites/ada/sptests/sp20/sptest.adb
diff --git a/c/src/ada-tests/sptests/sp20/sptest.ads b/testsuites/ada/sptests/sp20/sptest.ads
similarity index 100%
rename from c/src/ada-tests/sptests/sp20/sptest.ads
rename to testsuites/ada/sptests/sp20/sptest.ads
diff --git a/c/src/ada-tests/sptests/sp22/Makefile.am b/testsuites/ada/sptests/sp22/Makefile.am
similarity index 74%
rename from c/src/ada-tests/sptests/sp22/Makefile.am
rename to testsuites/ada/sptests/sp22/Makefile.am
index 168d23b..8b24be6 100644
--- a/c/src/ada-tests/sptests/sp22/Makefile.am
+++ b/testsuites/ada/sptests/sp22/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -13,4 +13,4 @@ ada_sp22$(EXEEXT): sp22.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp22.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/sptests/sp22/ada_sp22.scn b/testsuites/ada/sptests/sp22/ada_sp22.scn
similarity index 100%
rename from c/src/ada-tests/sptests/sp22/ada_sp22.scn
rename to testsuites/ada/sptests/sp22/ada_sp22.scn
diff --git a/c/src/ada-tests/sptests/sp22/config.h b/testsuites/ada/sptests/sp22/config.h
similarity index 100%
rename from c/src/ada-tests/sptests/sp22/config.h
rename to testsuites/ada/sptests/sp22/config.h
diff --git a/c/src/ada-tests/sptests/sp22/sp22.adb b/testsuites/ada/sptests/sp22/sp22.adb
similarity index 100%
rename from c/src/ada-tests/sptests/sp22/sp22.adb
rename to testsuites/ada/sptests/sp22/sp22.adb
diff --git a/c/src/ada-tests/sptests/sp22/sptest.adb b/testsuites/ada/sptests/sp22/sptest.adb
similarity index 100%
rename from c/src/ada-tests/sptests/sp22/sptest.adb
rename to testsuites/ada/sptests/sp22/sptest.adb
diff --git a/c/src/ada-tests/sptests/sp22/sptest.ads b/testsuites/ada/sptests/sp22/sptest.ads
similarity index 100%
rename from c/src/ada-tests/sptests/sp22/sptest.ads
rename to testsuites/ada/sptests/sp22/sptest.ads
diff --git a/c/src/ada-tests/sptests/sp23/Makefile.am b/testsuites/ada/sptests/sp23/Makefile.am
similarity index 74%
rename from c/src/ada-tests/sptests/sp23/Makefile.am
rename to testsuites/ada/sptests/sp23/Makefile.am
index c4823a8..ccd4bfe 100644
--- a/c/src/ada-tests/sptests/sp23/Makefile.am
+++ b/testsuites/ada/sptests/sp23/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -13,4 +13,4 @@ ada_sp23$(EXEEXT): sp23.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp23.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/sptests/sp23/ada_sp23.scn b/testsuites/ada/sptests/sp23/ada_sp23.scn
similarity index 100%
rename from c/src/ada-tests/sptests/sp23/ada_sp23.scn
rename to testsuites/ada/sptests/sp23/ada_sp23.scn
diff --git a/c/src/ada-tests/sptests/sp23/config.h b/testsuites/ada/sptests/sp23/config.h
similarity index 100%
rename from c/src/ada-tests/sptests/sp23/config.h
rename to testsuites/ada/sptests/sp23/config.h
diff --git a/c/src/ada-tests/sptests/sp23/sp23.adb b/testsuites/ada/sptests/sp23/sp23.adb
similarity index 100%
rename from c/src/ada-tests/sptests/sp23/sp23.adb
rename to testsuites/ada/sptests/sp23/sp23.adb
diff --git a/c/src/ada-tests/sptests/sp23/sptest.adb b/testsuites/ada/sptests/sp23/sptest.adb
similarity index 100%
rename from c/src/ada-tests/sptests/sp23/sptest.adb
rename to testsuites/ada/sptests/sp23/sptest.adb
diff --git a/c/src/ada-tests/sptests/sp23/sptest.ads b/testsuites/ada/sptests/sp23/sptest.ads
similarity index 100%
rename from c/src/ada-tests/sptests/sp23/sptest.ads
rename to testsuites/ada/sptests/sp23/sptest.ads
diff --git a/c/src/ada-tests/sptests/sp24/Makefile.am b/testsuites/ada/sptests/sp24/Makefile.am
similarity index 74%
rename from c/src/ada-tests/sptests/sp24/Makefile.am
rename to testsuites/ada/sptests/sp24/Makefile.am
index 044faae..a8ebaec 100644
--- a/c/src/ada-tests/sptests/sp24/Makefile.am
+++ b/testsuites/ada/sptests/sp24/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -13,4 +13,4 @@ ada_sp24$(EXEEXT): sp24.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp24.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/sptests/sp24/ada_sp24.scn b/testsuites/ada/sptests/sp24/ada_sp24.scn
similarity index 100%
rename from c/src/ada-tests/sptests/sp24/ada_sp24.scn
rename to testsuites/ada/sptests/sp24/ada_sp24.scn
diff --git a/c/src/ada-tests/sptests/sp24/config.h b/testsuites/ada/sptests/sp24/config.h
similarity index 100%
rename from c/src/ada-tests/sptests/sp24/config.h
rename to testsuites/ada/sptests/sp24/config.h
diff --git a/c/src/ada-tests/sptests/sp24/sp24.adb b/testsuites/ada/sptests/sp24/sp24.adb
similarity index 100%
rename from c/src/ada-tests/sptests/sp24/sp24.adb
rename to testsuites/ada/sptests/sp24/sp24.adb
diff --git a/c/src/ada-tests/sptests/sp24/sptest.adb b/testsuites/ada/sptests/sp24/sptest.adb
similarity index 100%
rename from c/src/ada-tests/sptests/sp24/sptest.adb
rename to testsuites/ada/sptests/sp24/sptest.adb
diff --git a/c/src/ada-tests/sptests/sp24/sptest.ads b/testsuites/ada/sptests/sp24/sptest.ads
similarity index 100%
rename from c/src/ada-tests/sptests/sp24/sptest.ads
rename to testsuites/ada/sptests/sp24/sptest.ads
diff --git a/c/src/ada-tests/sptests/sp25/Makefile.am b/testsuites/ada/sptests/sp25/Makefile.am
similarity index 74%
rename from c/src/ada-tests/sptests/sp25/Makefile.am
rename to testsuites/ada/sptests/sp25/Makefile.am
index e5a25e4..b4b864d 100644
--- a/c/src/ada-tests/sptests/sp25/Makefile.am
+++ b/testsuites/ada/sptests/sp25/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -13,4 +13,4 @@ ada_sp25$(EXEEXT): sp25.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp25.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/sptests/sp25/ada_sp25.scn b/testsuites/ada/sptests/sp25/ada_sp25.scn
similarity index 100%
rename from c/src/ada-tests/sptests/sp25/ada_sp25.scn
rename to testsuites/ada/sptests/sp25/ada_sp25.scn
diff --git a/c/src/ada-tests/sptests/sp25/config.h b/testsuites/ada/sptests/sp25/config.h
similarity index 100%
rename from c/src/ada-tests/sptests/sp25/config.h
rename to testsuites/ada/sptests/sp25/config.h
diff --git a/c/src/ada-tests/sptests/sp25/sp25.adb b/testsuites/ada/sptests/sp25/sp25.adb
similarity index 100%
rename from c/src/ada-tests/sptests/sp25/sp25.adb
rename to testsuites/ada/sptests/sp25/sp25.adb
diff --git a/c/src/ada-tests/sptests/sp25/sptest.adb b/testsuites/ada/sptests/sp25/sptest.adb
similarity index 100%
rename from c/src/ada-tests/sptests/sp25/sptest.adb
rename to testsuites/ada/sptests/sp25/sptest.adb
diff --git a/c/src/ada-tests/sptests/sp25/sptest.ads b/testsuites/ada/sptests/sp25/sptest.ads
similarity index 100%
rename from c/src/ada-tests/sptests/sp25/sptest.ads
rename to testsuites/ada/sptests/sp25/sptest.ads
diff --git a/c/src/ada-tests/sptests/spatcb01/Makefile.am b/testsuites/ada/sptests/spatcb01/Makefile.am
similarity index 74%
rename from c/src/ada-tests/sptests/spatcb01/Makefile.am
rename to testsuites/ada/sptests/spatcb01/Makefile.am
index 59e99ea..0e5dbaf 100644
--- a/c/src/ada-tests/sptests/spatcb01/Makefile.am
+++ b/testsuites/ada/sptests/spatcb01/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -13,4 +13,4 @@ ada_spatcb01$(EXEEXT): spatcb01.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_spatcb01.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/sptests/spatcb01/ada_spatcb01.scn b/testsuites/ada/sptests/spatcb01/ada_spatcb01.scn
similarity index 100%
rename from c/src/ada-tests/sptests/spatcb01/ada_spatcb01.scn
rename to testsuites/ada/sptests/spatcb01/ada_spatcb01.scn
diff --git a/c/src/ada-tests/sptests/spatcb01/config.h b/testsuites/ada/sptests/spatcb01/config.h
similarity index 100%
rename from c/src/ada-tests/sptests/spatcb01/config.h
rename to testsuites/ada/sptests/spatcb01/config.h
diff --git a/c/src/ada-tests/sptests/spatcb01/spatcb01.adb b/testsuites/ada/sptests/spatcb01/spatcb01.adb
similarity index 100%
rename from c/src/ada-tests/sptests/spatcb01/spatcb01.adb
rename to testsuites/ada/sptests/spatcb01/spatcb01.adb
diff --git a/c/src/ada-tests/sptests/spname01/Makefile.am b/testsuites/ada/sptests/spname01/Makefile.am
similarity index 76%
rename from c/src/ada-tests/sptests/spname01/Makefile.am
rename to testsuites/ada/sptests/spname01/Makefile.am
index ab5d8a6..fccab37 100644
--- a/c/src/ada-tests/sptests/spname01/Makefile.am
+++ b/testsuites/ada/sptests/spname01/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -15,4 +15,4 @@ init.$(OBJEXT): ../../support/init.c
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_spname01.scn
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/sptests/spname01/ada_spname01.scn b/testsuites/ada/sptests/spname01/ada_spname01.scn
similarity index 100%
rename from c/src/ada-tests/sptests/spname01/ada_spname01.scn
rename to testsuites/ada/sptests/spname01/ada_spname01.scn
diff --git a/c/src/ada-tests/samples/hello/config.h b/testsuites/ada/sptests/spname01/config.h
similarity index 100%
rename from c/src/ada-tests/samples/hello/config.h
rename to testsuites/ada/sptests/spname01/config.h
diff --git a/c/src/ada-tests/sptests/spname01/spname01.adb b/testsuites/ada/sptests/spname01/spname01.adb
similarity index 100%
rename from c/src/ada-tests/sptests/spname01/spname01.adb
rename to testsuites/ada/sptests/spname01/spname01.adb
diff --git a/c/src/ada-tests/sptests/spname01/sptest.adb b/testsuites/ada/sptests/spname01/sptest.adb
similarity index 100%
rename from c/src/ada-tests/sptests/spname01/sptest.adb
rename to testsuites/ada/sptests/spname01/sptest.adb
diff --git a/c/src/ada-tests/sptests/spname01/sptest.ads b/testsuites/ada/sptests/spname01/sptest.ads
similarity index 100%
rename from c/src/ada-tests/sptests/spname01/sptest.ads
rename to testsuites/ada/sptests/spname01/sptest.ads
diff --git a/c/src/ada-tests/support/Makefile.am b/testsuites/ada/support/Makefile.am
similarity index 88%
rename from c/src/ada-tests/support/Makefile.am
rename to testsuites/ada/support/Makefile.am
index 88a4014..2bd7193 100644
--- a/c/src/ada-tests/support/Makefile.am
+++ b/testsuites/ada/support/Makefile.am
@@ -15,4 +15,4 @@ EXTRA_DIST += timer_driver.adb
 EXTRA_DIST += timer_driver.ads
 EXTRA_DIST += unsigned32_io.ads
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/support/address_io.adb b/testsuites/ada/support/address_io.adb
similarity index 100%
rename from c/src/ada-tests/support/address_io.adb
rename to testsuites/ada/support/address_io.adb
diff --git a/c/src/ada-tests/support/address_io.ads b/testsuites/ada/support/address_io.ads
similarity index 100%
rename from c/src/ada-tests/support/address_io.ads
rename to testsuites/ada/support/address_io.ads
diff --git a/c/src/ada-tests/support/float_io.ads b/testsuites/ada/support/float_io.ads
similarity index 100%
rename from c/src/ada-tests/support/float_io.ads
rename to testsuites/ada/support/float_io.ads
diff --git a/c/src/ada-tests/support/fp.inc b/testsuites/ada/support/fp.inc
similarity index 100%
rename from c/src/ada-tests/support/fp.inc
rename to testsuites/ada/support/fp.inc
diff --git a/c/src/ada-tests/support/init.c b/testsuites/ada/support/init.c
similarity index 100%
rename from c/src/ada-tests/support/init.c
rename to testsuites/ada/support/init.c
diff --git a/c/src/ada-tests/support/integer.inc b/testsuites/ada/support/integer.inc
similarity index 100%
rename from c/src/ada-tests/support/integer.inc
rename to testsuites/ada/support/integer.inc
diff --git a/c/src/ada-tests/support/rtems_calling_overhead.ads b/testsuites/ada/support/rtems_calling_overhead.ads
similarity index 100%
rename from c/src/ada-tests/support/rtems_calling_overhead.ads
rename to testsuites/ada/support/rtems_calling_overhead.ads
diff --git a/c/src/ada-tests/support/status_io.ads b/testsuites/ada/support/status_io.ads
similarity index 100%
rename from c/src/ada-tests/support/status_io.ads
rename to testsuites/ada/support/status_io.ads
diff --git a/c/src/ada-tests/support/test_support.adb b/testsuites/ada/support/test_support.adb
similarity index 100%
rename from c/src/ada-tests/support/test_support.adb
rename to testsuites/ada/support/test_support.adb
diff --git a/c/src/ada-tests/support/test_support.ads b/testsuites/ada/support/test_support.ads
similarity index 100%
rename from c/src/ada-tests/support/test_support.ads
rename to testsuites/ada/support/test_support.ads
diff --git a/c/src/ada-tests/support/time_test_support.adb b/testsuites/ada/support/time_test_support.adb
similarity index 100%
rename from c/src/ada-tests/support/time_test_support.adb
rename to testsuites/ada/support/time_test_support.adb
diff --git a/c/src/ada-tests/support/time_test_support.ads b/testsuites/ada/support/time_test_support.ads
similarity index 100%
rename from c/src/ada-tests/support/time_test_support.ads
rename to testsuites/ada/support/time_test_support.ads
diff --git a/c/src/ada-tests/support/timer_driver.adb b/testsuites/ada/support/timer_driver.adb
similarity index 100%
rename from c/src/ada-tests/support/timer_driver.adb
rename to testsuites/ada/support/timer_driver.adb
diff --git a/c/src/ada-tests/support/timer_driver.ads b/testsuites/ada/support/timer_driver.ads
similarity index 100%
rename from c/src/ada-tests/support/timer_driver.ads
rename to testsuites/ada/support/timer_driver.ads
diff --git a/c/src/ada-tests/support/unsigned32_io.ads b/testsuites/ada/support/unsigned32_io.ads
similarity index 100%
rename from c/src/ada-tests/support/unsigned32_io.ads
rename to testsuites/ada/support/unsigned32_io.ads
diff --git a/c/src/ada-tests/tmtests/Makefile.am b/testsuites/ada/tmtests/Makefile.am
similarity index 80%
rename from c/src/ada-tests/tmtests/Makefile.am
rename to testsuites/ada/tmtests/Makefile.am
index 64b5f6f..4cf9517 100644
--- a/c/src/ada-tests/tmtests/Makefile.am
+++ b/testsuites/ada/tmtests/Makefile.am
@@ -29,5 +29,5 @@ _SUBDIRS += tm29
 _SUBDIRS += tmck
 _SUBDIRS += tmoverhd
 
-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/tmtests/tm01/Makefile.am b/testsuites/ada/tmtests/tm01/Makefile.am
similarity index 70%
rename from c/src/ada-tests/tmtests/tm01/Makefile.am
rename to testsuites/ada/tmtests/tm01/Makefile.am
index 18932e9..4fb8798 100644
--- a/c/src/ada-tests/tmtests/tm01/Makefile.am
+++ b/testsuites/ada/tmtests/tm01/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm01_SOURCES += ../../support/init.c
 ada_tm01$(EXEEXT): tm01.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tmoverhd/config.h b/testsuites/ada/tmtests/tm01/config.h
similarity index 100%
rename from c/src/ada-tests/tmtests/tmoverhd/config.h
rename to testsuites/ada/tmtests/tm01/config.h
diff --git a/c/src/ada-tests/tmtests/tm01/tm01.adb b/testsuites/ada/tmtests/tm01/tm01.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm01/tm01.adb
rename to testsuites/ada/tmtests/tm01/tm01.adb
diff --git a/c/src/ada-tests/tmtests/tm01/tmtest.adb b/testsuites/ada/tmtests/tm01/tmtest.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm01/tmtest.adb
rename to testsuites/ada/tmtests/tm01/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm01/tmtest.ads b/testsuites/ada/tmtests/tm01/tmtest.ads
similarity index 100%
rename from c/src/ada-tests/tmtests/tm01/tmtest.ads
rename to testsuites/ada/tmtests/tm01/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tm02/Makefile.am b/testsuites/ada/tmtests/tm02/Makefile.am
similarity index 70%
rename from c/src/ada-tests/tmtests/tm02/Makefile.am
rename to testsuites/ada/tmtests/tm02/Makefile.am
index c8d86e7..a35c094 100644
--- a/c/src/ada-tests/tmtests/tm02/Makefile.am
+++ b/testsuites/ada/tmtests/tm02/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm02_SOURCES += ../../support/init.c
 ada_tm02$(EXEEXT): tm02.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm08/config.h b/testsuites/ada/tmtests/tm02/config.h
similarity index 100%
rename from c/src/ada-tests/tmtests/tm08/config.h
rename to testsuites/ada/tmtests/tm02/config.h
diff --git a/c/src/ada-tests/tmtests/tm02/tm02.adb b/testsuites/ada/tmtests/tm02/tm02.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm02/tm02.adb
rename to testsuites/ada/tmtests/tm02/tm02.adb
diff --git a/c/src/ada-tests/tmtests/tm02/tmtest.adb b/testsuites/ada/tmtests/tm02/tmtest.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm02/tmtest.adb
rename to testsuites/ada/tmtests/tm02/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm02/tmtest.ads b/testsuites/ada/tmtests/tm02/tmtest.ads
similarity index 100%
rename from c/src/ada-tests/tmtests/tm02/tmtest.ads
rename to testsuites/ada/tmtests/tm02/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tm03/Makefile.am b/testsuites/ada/tmtests/tm03/Makefile.am
similarity index 70%
rename from c/src/ada-tests/tmtests/tm03/Makefile.am
rename to testsuites/ada/tmtests/tm03/Makefile.am
index ea61d4b..81aa663 100644
--- a/c/src/ada-tests/tmtests/tm03/Makefile.am
+++ b/testsuites/ada/tmtests/tm03/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm03_SOURCES += ../../support/init.c
 ada_tm03$(EXEEXT): tm03.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm07/config.h b/testsuites/ada/tmtests/tm03/config.h
similarity index 100%
rename from c/src/ada-tests/tmtests/tm07/config.h
rename to testsuites/ada/tmtests/tm03/config.h
diff --git a/c/src/ada-tests/tmtests/tm03/tm03.adb b/testsuites/ada/tmtests/tm03/tm03.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm03/tm03.adb
rename to testsuites/ada/tmtests/tm03/tm03.adb
diff --git a/c/src/ada-tests/tmtests/tm03/tmtest.adb b/testsuites/ada/tmtests/tm03/tmtest.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm03/tmtest.adb
rename to testsuites/ada/tmtests/tm03/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm03/tmtest.ads b/testsuites/ada/tmtests/tm03/tmtest.ads
similarity index 100%
rename from c/src/ada-tests/tmtests/tm03/tmtest.ads
rename to testsuites/ada/tmtests/tm03/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tm04/Makefile.am b/testsuites/ada/tmtests/tm04/Makefile.am
similarity index 70%
rename from c/src/ada-tests/tmtests/tm04/Makefile.am
rename to testsuites/ada/tmtests/tm04/Makefile.am
index 744e383..2aa62a7 100644
--- a/c/src/ada-tests/tmtests/tm04/Makefile.am
+++ b/testsuites/ada/tmtests/tm04/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm04_SOURCES += ../../support/init.c
 ada_tm04$(EXEEXT): tm04.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm25/config.h b/testsuites/ada/tmtests/tm04/config.h
similarity index 100%
rename from c/src/ada-tests/tmtests/tm25/config.h
rename to testsuites/ada/tmtests/tm04/config.h
diff --git a/c/src/ada-tests/tmtests/tm04/tm04.adb b/testsuites/ada/tmtests/tm04/tm04.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm04/tm04.adb
rename to testsuites/ada/tmtests/tm04/tm04.adb
diff --git a/c/src/ada-tests/tmtests/tm04/tmtest.adb b/testsuites/ada/tmtests/tm04/tmtest.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm04/tmtest.adb
rename to testsuites/ada/tmtests/tm04/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm04/tmtest.ads b/testsuites/ada/tmtests/tm04/tmtest.ads
similarity index 100%
rename from c/src/ada-tests/tmtests/tm04/tmtest.ads
rename to testsuites/ada/tmtests/tm04/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tm05/Makefile.am b/testsuites/ada/tmtests/tm05/Makefile.am
similarity index 70%
rename from c/src/ada-tests/tmtests/tm05/Makefile.am
rename to testsuites/ada/tmtests/tm05/Makefile.am
index 9398956..1d723e1 100644
--- a/c/src/ada-tests/tmtests/tm05/Makefile.am
+++ b/testsuites/ada/tmtests/tm05/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm05_SOURCES += ../../support/init.c
 ada_tm05$(EXEEXT): tm05.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm06/config.h b/testsuites/ada/tmtests/tm05/config.h
similarity index 100%
rename from c/src/ada-tests/tmtests/tm06/config.h
rename to testsuites/ada/tmtests/tm05/config.h
diff --git a/c/src/ada-tests/tmtests/tm05/tm05.adb b/testsuites/ada/tmtests/tm05/tm05.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm05/tm05.adb
rename to testsuites/ada/tmtests/tm05/tm05.adb
diff --git a/c/src/ada-tests/tmtests/tm05/tmtest.adb b/testsuites/ada/tmtests/tm05/tmtest.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm05/tmtest.adb
rename to testsuites/ada/tmtests/tm05/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm05/tmtest.ads b/testsuites/ada/tmtests/tm05/tmtest.ads
similarity index 100%
rename from c/src/ada-tests/tmtests/tm05/tmtest.ads
rename to testsuites/ada/tmtests/tm05/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tm06/Makefile.am b/testsuites/ada/tmtests/tm06/Makefile.am
similarity index 70%
rename from c/src/ada-tests/tmtests/tm06/Makefile.am
rename to testsuites/ada/tmtests/tm06/Makefile.am
index 881effa..a1e5edf 100644
--- a/c/src/ada-tests/tmtests/tm06/Makefile.am
+++ b/testsuites/ada/tmtests/tm06/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm06_SOURCES += ../../support/init.c
 ada_tm06$(EXEEXT): tm06.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm05/config.h b/testsuites/ada/tmtests/tm06/config.h
similarity index 100%
rename from c/src/ada-tests/tmtests/tm05/config.h
rename to testsuites/ada/tmtests/tm06/config.h
diff --git a/c/src/ada-tests/tmtests/tm06/tm06.adb b/testsuites/ada/tmtests/tm06/tm06.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm06/tm06.adb
rename to testsuites/ada/tmtests/tm06/tm06.adb
diff --git a/c/src/ada-tests/tmtests/tm06/tmtest.adb b/testsuites/ada/tmtests/tm06/tmtest.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm06/tmtest.adb
rename to testsuites/ada/tmtests/tm06/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm06/tmtest.ads b/testsuites/ada/tmtests/tm06/tmtest.ads
similarity index 100%
rename from c/src/ada-tests/tmtests/tm06/tmtest.ads
rename to testsuites/ada/tmtests/tm06/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tm07/Makefile.am b/testsuites/ada/tmtests/tm07/Makefile.am
similarity index 70%
rename from c/src/ada-tests/tmtests/tm07/Makefile.am
rename to testsuites/ada/tmtests/tm07/Makefile.am
index d4bbd23..446c47d 100644
--- a/c/src/ada-tests/tmtests/tm07/Makefile.am
+++ b/testsuites/ada/tmtests/tm07/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm07_SOURCES += ../../support/init.c
 ada_tm07$(EXEEXT): tm07.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm03/config.h b/testsuites/ada/tmtests/tm07/config.h
similarity index 100%
rename from c/src/ada-tests/tmtests/tm03/config.h
rename to testsuites/ada/tmtests/tm07/config.h
diff --git a/c/src/ada-tests/tmtests/tm07/tm07.adb b/testsuites/ada/tmtests/tm07/tm07.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm07/tm07.adb
rename to testsuites/ada/tmtests/tm07/tm07.adb
diff --git a/c/src/ada-tests/tmtests/tm07/tmtest.adb b/testsuites/ada/tmtests/tm07/tmtest.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm07/tmtest.adb
rename to testsuites/ada/tmtests/tm07/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm07/tmtest.ads b/testsuites/ada/tmtests/tm07/tmtest.ads
similarity index 100%
rename from c/src/ada-tests/tmtests/tm07/tmtest.ads
rename to testsuites/ada/tmtests/tm07/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tm08/Makefile.am b/testsuites/ada/tmtests/tm08/Makefile.am
similarity index 70%
rename from c/src/ada-tests/tmtests/tm08/Makefile.am
rename to testsuites/ada/tmtests/tm08/Makefile.am
index b37d09d..1b79606 100644
--- a/c/src/ada-tests/tmtests/tm08/Makefile.am
+++ b/testsuites/ada/tmtests/tm08/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm08_SOURCES += ../../support/init.c
 ada_tm08$(EXEEXT): tm08.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm02/config.h b/testsuites/ada/tmtests/tm08/config.h
similarity index 100%
rename from c/src/ada-tests/tmtests/tm02/config.h
rename to testsuites/ada/tmtests/tm08/config.h
diff --git a/c/src/ada-tests/tmtests/tm08/tm08.adb b/testsuites/ada/tmtests/tm08/tm08.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm08/tm08.adb
rename to testsuites/ada/tmtests/tm08/tm08.adb
diff --git a/c/src/ada-tests/tmtests/tm08/tmtest.adb b/testsuites/ada/tmtests/tm08/tmtest.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm08/tmtest.adb
rename to testsuites/ada/tmtests/tm08/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm08/tmtest.ads b/testsuites/ada/tmtests/tm08/tmtest.ads
similarity index 100%
rename from c/src/ada-tests/tmtests/tm08/tmtest.ads
rename to testsuites/ada/tmtests/tm08/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tm09/Makefile.am b/testsuites/ada/tmtests/tm09/Makefile.am
similarity index 70%
rename from c/src/ada-tests/tmtests/tm09/Makefile.am
rename to testsuites/ada/tmtests/tm09/Makefile.am
index e0be06a..02a2317 100644
--- a/c/src/ada-tests/tmtests/tm09/Makefile.am
+++ b/testsuites/ada/tmtests/tm09/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm09_SOURCES += ../../support/init.c
 ada_tm09$(EXEEXT): tm09.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm09/config.h b/testsuites/ada/tmtests/tm09/config.h
similarity index 100%
rename from c/src/ada-tests/tmtests/tm09/config.h
rename to testsuites/ada/tmtests/tm09/config.h
diff --git a/c/src/ada-tests/tmtests/tm09/tm09.adb b/testsuites/ada/tmtests/tm09/tm09.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm09/tm09.adb
rename to testsuites/ada/tmtests/tm09/tm09.adb
diff --git a/c/src/ada-tests/tmtests/tm09/tmtest.adb b/testsuites/ada/tmtests/tm09/tmtest.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm09/tmtest.adb
rename to testsuites/ada/tmtests/tm09/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm09/tmtest.ads b/testsuites/ada/tmtests/tm09/tmtest.ads
similarity index 100%
rename from c/src/ada-tests/tmtests/tm09/tmtest.ads
rename to testsuites/ada/tmtests/tm09/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tm10/Makefile.am b/testsuites/ada/tmtests/tm10/Makefile.am
similarity index 70%
rename from c/src/ada-tests/tmtests/tm10/Makefile.am
rename to testsuites/ada/tmtests/tm10/Makefile.am
index 43b039d..8becdcb 100644
--- a/c/src/ada-tests/tmtests/tm10/Makefile.am
+++ b/testsuites/ada/tmtests/tm10/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm10_SOURCES += ../../support/init.c
 ada_tm10$(EXEEXT): tm10.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm10/config.h b/testsuites/ada/tmtests/tm10/config.h
similarity index 100%
rename from c/src/ada-tests/tmtests/tm10/config.h
rename to testsuites/ada/tmtests/tm10/config.h
diff --git a/c/src/ada-tests/tmtests/tm10/tm10.adb b/testsuites/ada/tmtests/tm10/tm10.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm10/tm10.adb
rename to testsuites/ada/tmtests/tm10/tm10.adb
diff --git a/c/src/ada-tests/tmtests/tm10/tmtest.adb b/testsuites/ada/tmtests/tm10/tmtest.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm10/tmtest.adb
rename to testsuites/ada/tmtests/tm10/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm10/tmtest.ads b/testsuites/ada/tmtests/tm10/tmtest.ads
similarity index 100%
rename from c/src/ada-tests/tmtests/tm10/tmtest.ads
rename to testsuites/ada/tmtests/tm10/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tm11/Makefile.am b/testsuites/ada/tmtests/tm11/Makefile.am
similarity index 70%
rename from c/src/ada-tests/tmtests/tm11/Makefile.am
rename to testsuites/ada/tmtests/tm11/Makefile.am
index a5532f2..8779d31 100644
--- a/c/src/ada-tests/tmtests/tm11/Makefile.am
+++ b/testsuites/ada/tmtests/tm11/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm11_SOURCES += ../../support/init.c
 ada_tm11$(EXEEXT): tm11.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm19/config.h b/testsuites/ada/tmtests/tm11/config.h
similarity index 100%
rename from c/src/ada-tests/tmtests/tm19/config.h
rename to testsuites/ada/tmtests/tm11/config.h
diff --git a/c/src/ada-tests/tmtests/tm11/tm11.adb b/testsuites/ada/tmtests/tm11/tm11.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm11/tm11.adb
rename to testsuites/ada/tmtests/tm11/tm11.adb
diff --git a/c/src/ada-tests/tmtests/tm11/tmtest.adb b/testsuites/ada/tmtests/tm11/tmtest.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm11/tmtest.adb
rename to testsuites/ada/tmtests/tm11/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm11/tmtest.ads b/testsuites/ada/tmtests/tm11/tmtest.ads
similarity index 100%
rename from c/src/ada-tests/tmtests/tm11/tmtest.ads
rename to testsuites/ada/tmtests/tm11/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tm12/Makefile.am b/testsuites/ada/tmtests/tm12/Makefile.am
similarity index 70%
rename from c/src/ada-tests/tmtests/tm12/Makefile.am
rename to testsuites/ada/tmtests/tm12/Makefile.am
index 925aa17..477ee54 100644
--- a/c/src/ada-tests/tmtests/tm12/Makefile.am
+++ b/testsuites/ada/tmtests/tm12/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm12_SOURCES += ../../support/init.c
 ada_tm12$(EXEEXT): tm12.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm18/config.h b/testsuites/ada/tmtests/tm12/config.h
similarity index 100%
rename from c/src/ada-tests/tmtests/tm18/config.h
rename to testsuites/ada/tmtests/tm12/config.h
diff --git a/c/src/ada-tests/tmtests/tm12/tm12.adb b/testsuites/ada/tmtests/tm12/tm12.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm12/tm12.adb
rename to testsuites/ada/tmtests/tm12/tm12.adb
diff --git a/c/src/ada-tests/tmtests/tm12/tmtest.adb b/testsuites/ada/tmtests/tm12/tmtest.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm12/tmtest.adb
rename to testsuites/ada/tmtests/tm12/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm12/tmtest.ads b/testsuites/ada/tmtests/tm12/tmtest.ads
similarity index 100%
rename from c/src/ada-tests/tmtests/tm12/tmtest.ads
rename to testsuites/ada/tmtests/tm12/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tm13/Makefile.am b/testsuites/ada/tmtests/tm13/Makefile.am
similarity index 70%
rename from c/src/ada-tests/tmtests/tm13/Makefile.am
rename to testsuites/ada/tmtests/tm13/Makefile.am
index cc8bb32..9fc5961 100644
--- a/c/src/ada-tests/tmtests/tm13/Makefile.am
+++ b/testsuites/ada/tmtests/tm13/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm13_SOURCES += ../../support/init.c
 ada_tm13$(EXEEXT): tm13.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm17/config.h b/testsuites/ada/tmtests/tm13/config.h
similarity index 100%
rename from c/src/ada-tests/tmtests/tm17/config.h
rename to testsuites/ada/tmtests/tm13/config.h
diff --git a/c/src/ada-tests/tmtests/tm13/tm13.adb b/testsuites/ada/tmtests/tm13/tm13.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm13/tm13.adb
rename to testsuites/ada/tmtests/tm13/tm13.adb
diff --git a/c/src/ada-tests/tmtests/tm13/tmtest.adb b/testsuites/ada/tmtests/tm13/tmtest.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm13/tmtest.adb
rename to testsuites/ada/tmtests/tm13/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm13/tmtest.ads b/testsuites/ada/tmtests/tm13/tmtest.ads
similarity index 100%
rename from c/src/ada-tests/tmtests/tm13/tmtest.ads
rename to testsuites/ada/tmtests/tm13/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tm14/Makefile.am b/testsuites/ada/tmtests/tm14/Makefile.am
similarity index 70%
rename from c/src/ada-tests/tmtests/tm14/Makefile.am
rename to testsuites/ada/tmtests/tm14/Makefile.am
index 0577c8a..bc5e7d0 100644
--- a/c/src/ada-tests/tmtests/tm14/Makefile.am
+++ b/testsuites/ada/tmtests/tm14/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm14_SOURCES += ../../support/init.c
 ada_tm14$(EXEEXT): tm14.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm16/config.h b/testsuites/ada/tmtests/tm14/config.h
similarity index 100%
rename from c/src/ada-tests/tmtests/tm16/config.h
rename to testsuites/ada/tmtests/tm14/config.h
diff --git a/c/src/ada-tests/tmtests/tm14/tm14.adb b/testsuites/ada/tmtests/tm14/tm14.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm14/tm14.adb
rename to testsuites/ada/tmtests/tm14/tm14.adb
diff --git a/c/src/ada-tests/tmtests/tm14/tmtest.adb b/testsuites/ada/tmtests/tm14/tmtest.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm14/tmtest.adb
rename to testsuites/ada/tmtests/tm14/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm14/tmtest.ads b/testsuites/ada/tmtests/tm14/tmtest.ads
similarity index 100%
rename from c/src/ada-tests/tmtests/tm14/tmtest.ads
rename to testsuites/ada/tmtests/tm14/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tm15/Makefile.am b/testsuites/ada/tmtests/tm15/Makefile.am
similarity index 70%
rename from c/src/ada-tests/tmtests/tm15/Makefile.am
rename to testsuites/ada/tmtests/tm15/Makefile.am
index 09713d4..e792c9b 100644
--- a/c/src/ada-tests/tmtests/tm15/Makefile.am
+++ b/testsuites/ada/tmtests/tm15/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm15_SOURCES += ../../support/init.c
 ada_tm15$(EXEEXT): tm15.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm15/config.h b/testsuites/ada/tmtests/tm15/config.h
similarity index 100%
rename from c/src/ada-tests/tmtests/tm15/config.h
rename to testsuites/ada/tmtests/tm15/config.h
diff --git a/c/src/ada-tests/tmtests/tm15/tm15.adb b/testsuites/ada/tmtests/tm15/tm15.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm15/tm15.adb
rename to testsuites/ada/tmtests/tm15/tm15.adb
diff --git a/c/src/ada-tests/tmtests/tm15/tmtest.adb b/testsuites/ada/tmtests/tm15/tmtest.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm15/tmtest.adb
rename to testsuites/ada/tmtests/tm15/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm15/tmtest.ads b/testsuites/ada/tmtests/tm15/tmtest.ads
similarity index 100%
rename from c/src/ada-tests/tmtests/tm15/tmtest.ads
rename to testsuites/ada/tmtests/tm15/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tm16/Makefile.am b/testsuites/ada/tmtests/tm16/Makefile.am
similarity index 70%
rename from c/src/ada-tests/tmtests/tm16/Makefile.am
rename to testsuites/ada/tmtests/tm16/Makefile.am
index e3a598b..9525797 100644
--- a/c/src/ada-tests/tmtests/tm16/Makefile.am
+++ b/testsuites/ada/tmtests/tm16/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm16_SOURCES += ../../support/init.c
 ada_tm16$(EXEEXT): tm16.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm14/config.h b/testsuites/ada/tmtests/tm16/config.h
similarity index 100%
rename from c/src/ada-tests/tmtests/tm14/config.h
rename to testsuites/ada/tmtests/tm16/config.h
diff --git a/c/src/ada-tests/tmtests/tm16/tm16.adb b/testsuites/ada/tmtests/tm16/tm16.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm16/tm16.adb
rename to testsuites/ada/tmtests/tm16/tm16.adb
diff --git a/c/src/ada-tests/tmtests/tm16/tmtest.adb b/testsuites/ada/tmtests/tm16/tmtest.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm16/tmtest.adb
rename to testsuites/ada/tmtests/tm16/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm16/tmtest.ads b/testsuites/ada/tmtests/tm16/tmtest.ads
similarity index 100%
rename from c/src/ada-tests/tmtests/tm16/tmtest.ads
rename to testsuites/ada/tmtests/tm16/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tm17/Makefile.am b/testsuites/ada/tmtests/tm17/Makefile.am
similarity index 70%
rename from c/src/ada-tests/tmtests/tm17/Makefile.am
rename to testsuites/ada/tmtests/tm17/Makefile.am
index b46cc74..d8715de 100644
--- a/c/src/ada-tests/tmtests/tm17/Makefile.am
+++ b/testsuites/ada/tmtests/tm17/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm17_SOURCES += ../../support/init.c
 ada_tm17$(EXEEXT): tm17.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm13/config.h b/testsuites/ada/tmtests/tm17/config.h
similarity index 100%
rename from c/src/ada-tests/tmtests/tm13/config.h
rename to testsuites/ada/tmtests/tm17/config.h
diff --git a/c/src/ada-tests/tmtests/tm17/tm17.adb b/testsuites/ada/tmtests/tm17/tm17.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm17/tm17.adb
rename to testsuites/ada/tmtests/tm17/tm17.adb
diff --git a/c/src/ada-tests/tmtests/tm17/tmtest.adb b/testsuites/ada/tmtests/tm17/tmtest.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm17/tmtest.adb
rename to testsuites/ada/tmtests/tm17/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm17/tmtest.ads b/testsuites/ada/tmtests/tm17/tmtest.ads
similarity index 100%
rename from c/src/ada-tests/tmtests/tm17/tmtest.ads
rename to testsuites/ada/tmtests/tm17/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tm18/Makefile.am b/testsuites/ada/tmtests/tm18/Makefile.am
similarity index 70%
rename from c/src/ada-tests/tmtests/tm18/Makefile.am
rename to testsuites/ada/tmtests/tm18/Makefile.am
index e1c08d4..62820c5 100644
--- a/c/src/ada-tests/tmtests/tm18/Makefile.am
+++ b/testsuites/ada/tmtests/tm18/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm18_SOURCES += ../../support/init.c
 ada_tm18$(EXEEXT): tm18.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm12/config.h b/testsuites/ada/tmtests/tm18/config.h
similarity index 100%
rename from c/src/ada-tests/tmtests/tm12/config.h
rename to testsuites/ada/tmtests/tm18/config.h
diff --git a/c/src/ada-tests/tmtests/tm18/tm18.adb b/testsuites/ada/tmtests/tm18/tm18.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm18/tm18.adb
rename to testsuites/ada/tmtests/tm18/tm18.adb
diff --git a/c/src/ada-tests/tmtests/tm18/tmtest.adb b/testsuites/ada/tmtests/tm18/tmtest.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm18/tmtest.adb
rename to testsuites/ada/tmtests/tm18/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm18/tmtest.ads b/testsuites/ada/tmtests/tm18/tmtest.ads
similarity index 100%
rename from c/src/ada-tests/tmtests/tm18/tmtest.ads
rename to testsuites/ada/tmtests/tm18/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tm19/Makefile.am b/testsuites/ada/tmtests/tm19/Makefile.am
similarity index 70%
rename from c/src/ada-tests/tmtests/tm19/Makefile.am
rename to testsuites/ada/tmtests/tm19/Makefile.am
index 3ce11ec..c21692b 100644
--- a/c/src/ada-tests/tmtests/tm19/Makefile.am
+++ b/testsuites/ada/tmtests/tm19/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm19_SOURCES += ../../support/init.c
 ada_tm19$(EXEEXT): tm19.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm11/config.h b/testsuites/ada/tmtests/tm19/config.h
similarity index 100%
rename from c/src/ada-tests/tmtests/tm11/config.h
rename to testsuites/ada/tmtests/tm19/config.h
diff --git a/c/src/ada-tests/tmtests/tm19/tm19.adb b/testsuites/ada/tmtests/tm19/tm19.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm19/tm19.adb
rename to testsuites/ada/tmtests/tm19/tm19.adb
diff --git a/c/src/ada-tests/tmtests/tm19/tmtest.adb b/testsuites/ada/tmtests/tm19/tmtest.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm19/tmtest.adb
rename to testsuites/ada/tmtests/tm19/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm19/tmtest.ads b/testsuites/ada/tmtests/tm19/tmtest.ads
similarity index 100%
rename from c/src/ada-tests/tmtests/tm19/tmtest.ads
rename to testsuites/ada/tmtests/tm19/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tm20/Makefile.am b/testsuites/ada/tmtests/tm20/Makefile.am
similarity index 70%
rename from c/src/ada-tests/tmtests/tm20/Makefile.am
rename to testsuites/ada/tmtests/tm20/Makefile.am
index 03ff046..d4ca51d 100644
--- a/c/src/ada-tests/tmtests/tm20/Makefile.am
+++ b/testsuites/ada/tmtests/tm20/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm20_SOURCES += ../../support/init.c
 ada_tm20$(EXEEXT): tm20.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm20/config.h b/testsuites/ada/tmtests/tm20/config.h
similarity index 100%
rename from c/src/ada-tests/tmtests/tm20/config.h
rename to testsuites/ada/tmtests/tm20/config.h
diff --git a/c/src/ada-tests/tmtests/tm20/tm20.adb b/testsuites/ada/tmtests/tm20/tm20.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm20/tm20.adb
rename to testsuites/ada/tmtests/tm20/tm20.adb
diff --git a/c/src/ada-tests/tmtests/tm20/tmtest.adb b/testsuites/ada/tmtests/tm20/tmtest.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm20/tmtest.adb
rename to testsuites/ada/tmtests/tm20/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm20/tmtest.ads b/testsuites/ada/tmtests/tm20/tmtest.ads
similarity index 100%
rename from c/src/ada-tests/tmtests/tm20/tmtest.ads
rename to testsuites/ada/tmtests/tm20/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tm21/Makefile.am b/testsuites/ada/tmtests/tm21/Makefile.am
similarity index 70%
rename from c/src/ada-tests/tmtests/tm21/Makefile.am
rename to testsuites/ada/tmtests/tm21/Makefile.am
index 7adced3..37f4c6b 100644
--- a/c/src/ada-tests/tmtests/tm21/Makefile.am
+++ b/testsuites/ada/tmtests/tm21/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm21_SOURCES += ../../support/init.c
 ada_tm21$(EXEEXT): tm21.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm21/config.h b/testsuites/ada/tmtests/tm21/config.h
similarity index 100%
rename from c/src/ada-tests/tmtests/tm21/config.h
rename to testsuites/ada/tmtests/tm21/config.h
diff --git a/c/src/ada-tests/tmtests/tm21/tm21.adb b/testsuites/ada/tmtests/tm21/tm21.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm21/tm21.adb
rename to testsuites/ada/tmtests/tm21/tm21.adb
diff --git a/c/src/ada-tests/tmtests/tm21/tmtest.adb b/testsuites/ada/tmtests/tm21/tmtest.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm21/tmtest.adb
rename to testsuites/ada/tmtests/tm21/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm21/tmtest.ads b/testsuites/ada/tmtests/tm21/tmtest.ads
similarity index 100%
rename from c/src/ada-tests/tmtests/tm21/tmtest.ads
rename to testsuites/ada/tmtests/tm21/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tm22/Makefile.am b/testsuites/ada/tmtests/tm22/Makefile.am
similarity index 70%
rename from c/src/ada-tests/tmtests/tm22/Makefile.am
rename to testsuites/ada/tmtests/tm22/Makefile.am
index bbed77e..a477b99 100644
--- a/c/src/ada-tests/tmtests/tm22/Makefile.am
+++ b/testsuites/ada/tmtests/tm22/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm22_SOURCES += ../../support/init.c
 ada_tm22$(EXEEXT): tm22.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm22/config.h b/testsuites/ada/tmtests/tm22/config.h
similarity index 100%
rename from c/src/ada-tests/tmtests/tm22/config.h
rename to testsuites/ada/tmtests/tm22/config.h
diff --git a/c/src/ada-tests/tmtests/tm22/tm22.adb b/testsuites/ada/tmtests/tm22/tm22.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm22/tm22.adb
rename to testsuites/ada/tmtests/tm22/tm22.adb
diff --git a/c/src/ada-tests/tmtests/tm22/tmtest.adb b/testsuites/ada/tmtests/tm22/tmtest.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm22/tmtest.adb
rename to testsuites/ada/tmtests/tm22/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm22/tmtest.ads b/testsuites/ada/tmtests/tm22/tmtest.ads
similarity index 100%
rename from c/src/ada-tests/tmtests/tm22/tmtest.ads
rename to testsuites/ada/tmtests/tm22/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tm23/Makefile.am b/testsuites/ada/tmtests/tm23/Makefile.am
similarity index 70%
rename from c/src/ada-tests/tmtests/tm23/Makefile.am
rename to testsuites/ada/tmtests/tm23/Makefile.am
index 04800ce..6ee7aa4 100644
--- a/c/src/ada-tests/tmtests/tm23/Makefile.am
+++ b/testsuites/ada/tmtests/tm23/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm23_SOURCES += ../../support/init.c
 ada_tm23$(EXEEXT): tm23.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm23/config.h b/testsuites/ada/tmtests/tm23/config.h
similarity index 100%
rename from c/src/ada-tests/tmtests/tm23/config.h
rename to testsuites/ada/tmtests/tm23/config.h
diff --git a/c/src/ada-tests/tmtests/tm23/tm23.adb b/testsuites/ada/tmtests/tm23/tm23.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm23/tm23.adb
rename to testsuites/ada/tmtests/tm23/tm23.adb
diff --git a/c/src/ada-tests/tmtests/tm23/tmtest.adb b/testsuites/ada/tmtests/tm23/tmtest.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm23/tmtest.adb
rename to testsuites/ada/tmtests/tm23/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm23/tmtest.ads b/testsuites/ada/tmtests/tm23/tmtest.ads
similarity index 100%
rename from c/src/ada-tests/tmtests/tm23/tmtest.ads
rename to testsuites/ada/tmtests/tm23/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tm24/Makefile.am b/testsuites/ada/tmtests/tm24/Makefile.am
similarity index 70%
rename from c/src/ada-tests/tmtests/tm24/Makefile.am
rename to testsuites/ada/tmtests/tm24/Makefile.am
index cb0fdcb..9c7ec2e 100644
--- a/c/src/ada-tests/tmtests/tm24/Makefile.am
+++ b/testsuites/ada/tmtests/tm24/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm24_SOURCES += ../../support/init.c
 ada_tm24$(EXEEXT): tm24.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm24/config.h b/testsuites/ada/tmtests/tm24/config.h
similarity index 100%
rename from c/src/ada-tests/tmtests/tm24/config.h
rename to testsuites/ada/tmtests/tm24/config.h
diff --git a/c/src/ada-tests/tmtests/tm24/tm24.adb b/testsuites/ada/tmtests/tm24/tm24.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm24/tm24.adb
rename to testsuites/ada/tmtests/tm24/tm24.adb
diff --git a/c/src/ada-tests/tmtests/tm24/tmtest.adb b/testsuites/ada/tmtests/tm24/tmtest.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm24/tmtest.adb
rename to testsuites/ada/tmtests/tm24/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm24/tmtest.ads b/testsuites/ada/tmtests/tm24/tmtest.ads
similarity index 100%
rename from c/src/ada-tests/tmtests/tm24/tmtest.ads
rename to testsuites/ada/tmtests/tm24/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tm25/Makefile.am b/testsuites/ada/tmtests/tm25/Makefile.am
similarity index 70%
rename from c/src/ada-tests/tmtests/tm25/Makefile.am
rename to testsuites/ada/tmtests/tm25/Makefile.am
index d50089b..db67df9 100644
--- a/c/src/ada-tests/tmtests/tm25/Makefile.am
+++ b/testsuites/ada/tmtests/tm25/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm25_SOURCES += ../../support/init.c
 ada_tm25$(EXEEXT): tm25.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm04/config.h b/testsuites/ada/tmtests/tm25/config.h
similarity index 100%
rename from c/src/ada-tests/tmtests/tm04/config.h
rename to testsuites/ada/tmtests/tm25/config.h
diff --git a/c/src/ada-tests/tmtests/tm25/tm25.adb b/testsuites/ada/tmtests/tm25/tm25.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm25/tm25.adb
rename to testsuites/ada/tmtests/tm25/tm25.adb
diff --git a/c/src/ada-tests/tmtests/tm25/tmtest.adb b/testsuites/ada/tmtests/tm25/tmtest.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm25/tmtest.adb
rename to testsuites/ada/tmtests/tm25/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm25/tmtest.ads b/testsuites/ada/tmtests/tm25/tmtest.ads
similarity index 100%
rename from c/src/ada-tests/tmtests/tm25/tmtest.ads
rename to testsuites/ada/tmtests/tm25/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tm28/Makefile.am b/testsuites/ada/tmtests/tm28/Makefile.am
similarity index 70%
rename from c/src/ada-tests/tmtests/tm28/Makefile.am
rename to testsuites/ada/tmtests/tm28/Makefile.am
index e59b303..eca1e00 100644
--- a/c/src/ada-tests/tmtests/tm28/Makefile.am
+++ b/testsuites/ada/tmtests/tm28/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm28_SOURCES += ../../support/init.c
 ada_tm28$(EXEEXT): tm28.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm28/config.h b/testsuites/ada/tmtests/tm28/config.h
similarity index 100%
rename from c/src/ada-tests/tmtests/tm28/config.h
rename to testsuites/ada/tmtests/tm28/config.h
diff --git a/c/src/ada-tests/tmtests/tm28/tm28.adb b/testsuites/ada/tmtests/tm28/tm28.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm28/tm28.adb
rename to testsuites/ada/tmtests/tm28/tm28.adb
diff --git a/c/src/ada-tests/tmtests/tm28/tmtest.adb b/testsuites/ada/tmtests/tm28/tmtest.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm28/tmtest.adb
rename to testsuites/ada/tmtests/tm28/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm28/tmtest.ads b/testsuites/ada/tmtests/tm28/tmtest.ads
similarity index 100%
rename from c/src/ada-tests/tmtests/tm28/tmtest.ads
rename to testsuites/ada/tmtests/tm28/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tm29/Makefile.am b/testsuites/ada/tmtests/tm29/Makefile.am
similarity index 70%
rename from c/src/ada-tests/tmtests/tm29/Makefile.am
rename to testsuites/ada/tmtests/tm29/Makefile.am
index d28cd24..d34b097 100644
--- a/c/src/ada-tests/tmtests/tm29/Makefile.am
+++ b/testsuites/ada/tmtests/tm29/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tm29_SOURCES += ../../support/init.c
 ada_tm29$(EXEEXT): tm29.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm29/config.h b/testsuites/ada/tmtests/tm29/config.h
similarity index 100%
rename from c/src/ada-tests/tmtests/tm29/config.h
rename to testsuites/ada/tmtests/tm29/config.h
diff --git a/c/src/ada-tests/tmtests/tm29/tm29.adb b/testsuites/ada/tmtests/tm29/tm29.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm29/tm29.adb
rename to testsuites/ada/tmtests/tm29/tm29.adb
diff --git a/c/src/ada-tests/tmtests/tm29/tmtest.adb b/testsuites/ada/tmtests/tm29/tmtest.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tm29/tmtest.adb
rename to testsuites/ada/tmtests/tm29/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tm29/tmtest.ads b/testsuites/ada/tmtests/tm29/tmtest.ads
similarity index 100%
rename from c/src/ada-tests/tmtests/tm29/tmtest.ads
rename to testsuites/ada/tmtests/tm29/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tmck/Makefile.am b/testsuites/ada/tmtests/tmck/Makefile.am
similarity index 70%
rename from c/src/ada-tests/tmtests/tmck/Makefile.am
rename to testsuites/ada/tmtests/tmck/Makefile.am
index 7bbe2d7..a2fa295 100644
--- a/c/src/ada-tests/tmtests/tmck/Makefile.am
+++ b/testsuites/ada/tmtests/tmck/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -10,4 +10,4 @@ ada_tmck_SOURCES += ../../support/init.c
 ada_tmck$(EXEEXT): tmck.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tmck/config.h b/testsuites/ada/tmtests/tmck/config.h
similarity index 100%
rename from c/src/ada-tests/tmtests/tmck/config.h
rename to testsuites/ada/tmtests/tmck/config.h
diff --git a/c/src/ada-tests/tmtests/tmck/tmck.adb b/testsuites/ada/tmtests/tmck/tmck.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tmck/tmck.adb
rename to testsuites/ada/tmtests/tmck/tmck.adb
diff --git a/c/src/ada-tests/tmtests/tmck/tmtest.adb b/testsuites/ada/tmtests/tmck/tmtest.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tmck/tmtest.adb
rename to testsuites/ada/tmtests/tmck/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tmck/tmtest.ads b/testsuites/ada/tmtests/tmck/tmtest.ads
similarity index 100%
rename from c/src/ada-tests/tmtests/tmck/tmtest.ads
rename to testsuites/ada/tmtests/tmck/tmtest.ads
diff --git a/c/src/ada-tests/tmtests/tmoverhd/Makefile.am b/testsuites/ada/tmtests/tmoverhd/Makefile.am
similarity index 74%
rename from c/src/ada-tests/tmtests/tmoverhd/Makefile.am
rename to testsuites/ada/tmtests/tmoverhd/Makefile.am
index 316117f..8bc56dd 100644
--- a/c/src/ada-tests/tmtests/tmoverhd/Makefile.am
+++ b/testsuites/ada/tmtests/tmoverhd/Makefile.am
@@ -1,5 +1,5 @@
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../../../testsuites/automake/compile.am
+include $(top_srcdir)/../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
@@ -11,4 +11,4 @@ ada_tmoverhd_SOURCES += ../../support/init.c
 ada_tmoverhd$(EXEEXT): tmoverhd.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../../../testsuites/automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tmoverhd/README b/testsuites/ada/tmtests/tmoverhd/README
similarity index 100%
rename from c/src/ada-tests/tmtests/tmoverhd/README
rename to testsuites/ada/tmtests/tmoverhd/README
diff --git a/c/src/ada-tests/tmtests/tm01/config.h b/testsuites/ada/tmtests/tmoverhd/config.h
similarity index 100%
rename from c/src/ada-tests/tmtests/tm01/config.h
rename to testsuites/ada/tmtests/tmoverhd/config.h
diff --git a/c/src/ada-tests/tmtests/tmoverhd/dummy_rtems.adb b/testsuites/ada/tmtests/tmoverhd/dummy_rtems.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tmoverhd/dummy_rtems.adb
rename to testsuites/ada/tmtests/tmoverhd/dummy_rtems.adb
diff --git a/c/src/ada-tests/tmtests/tmoverhd/dummy_rtems.ads b/testsuites/ada/tmtests/tmoverhd/dummy_rtems.ads
similarity index 100%
rename from c/src/ada-tests/tmtests/tmoverhd/dummy_rtems.ads
rename to testsuites/ada/tmtests/tmoverhd/dummy_rtems.ads
diff --git a/c/src/ada-tests/tmtests/tmoverhd/tmoverhd.adb b/testsuites/ada/tmtests/tmoverhd/tmoverhd.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tmoverhd/tmoverhd.adb
rename to testsuites/ada/tmtests/tmoverhd/tmoverhd.adb
diff --git a/c/src/ada-tests/tmtests/tmoverhd/tmtest.adb b/testsuites/ada/tmtests/tmoverhd/tmtest.adb
similarity index 100%
rename from c/src/ada-tests/tmtests/tmoverhd/tmtest.adb
rename to testsuites/ada/tmtests/tmoverhd/tmtest.adb
diff --git a/c/src/ada-tests/tmtests/tmoverhd/tmtest.ads b/testsuites/ada/tmtests/tmoverhd/tmtest.ads
similarity index 100%
rename from c/src/ada-tests/tmtests/tmoverhd/tmtest.ads
rename to testsuites/ada/tmtests/tmoverhd/tmtest.ads
diff --git a/testsuites/configure.ac b/testsuites/configure.ac
index ab8aab8e..ae01a97 100644
--- a/testsuites/configure.ac
+++ b/testsuites/configure.ac
@@ -22,6 +22,14 @@ RTEMS_PROG_CXX_FOR_TARGET
 RTEMS_CANONICALIZE_TOOLS
 AM_PROG_CC_C_O
 
+AC_ARG_ENABLE([ada],
+[AS_HELP_STRING(--enable-ada,enable Ada support)],
+[case "${enable_ada}" in
+  yes) ;;
+  no) ;;
+  *)  AC_MSG_ERROR(bad value ${enable_ada} for --enable-ada) ;;
+esac],[enable_ada=no])
+
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 
 RTEMS_CHECK_CPUOPTS([RTEMS_POSIX_API])
@@ -44,6 +52,9 @@ if test "$enable_tests" = "yes"; then
   if test "$rtems_cv_RTEMS_SMP" = "yes"; then
     AC_CONFIG_SUBDIRS(smptests)
   fi
+  if test "$enable_ada" = "yes"; then
+    AC_CONFIG_SUBDIRS(ada)
+  fi
   # Now do performance tests
   AC_CONFIG_SUBDIRS(tmtests psxtmtests benchmarks rhealstone)
 fi




More information about the vc mailing list