diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-12-01 08:51:17 +0100 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-12-01 09:52:41 +0100 |
| commit | f6c9334d9b78d8a9791b2ba3ab401c43fb6eb39e (patch) | |
| tree | 2a06c91d9977552a5a42292fb9cbd8094b7f6485 /testsuites/ada | |
| parent | ada: Delete superfluous CONFIGURE_SPTEST (diff) | |
| download | rtems-f6c9334d9b78d8a9791b2ba3ab401c43fb6eb39e.tar.bz2 | |
ada: Add standard test begin/end message
Diffstat (limited to 'testsuites/ada')
144 files changed, 324 insertions, 144 deletions
diff --git a/testsuites/ada/mptests/mp01/config_base.h b/testsuites/ada/mptests/mp01/config_base.h index 2559d1a9ae..fca97d644d 100644 --- a/testsuites/ada/mptests/mp01/config_base.h +++ b/testsuites/ada/mptests/mp01/config_base.h @@ -20,6 +20,8 @@ #define CONFIGURE_MAXIMUM_TASKS 2 +#define ADA_TEST_NAME "ADA MP 1" + #define CONFIGURE_MAXIMUM_POSIX_THREADS 10 #define CONFIGURE_MAXIMUM_POSIX_KEYS 10 diff --git a/testsuites/ada/mptests/mp01/mptest.adb b/testsuites/ada/mptests/mp01/mptest.adb index b76a1af8dc..457a21f58e 100644 --- a/testsuites/ada/mptests/mp01/mptest.adb +++ b/testsuites/ada/mptests/mp01/mptest.adb @@ -41,7 +41,8 @@ package body MPTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT( "*** TEST 1 -- NODE " ); + TEST_SUPPORT.ADA_TEST_BEGIN; + TEXT_IO.PUT( "*** NODE " ); UNSIGNED32_IO.PUT( TEST_SUPPORT.NODE, WIDTH => 1 @@ -221,7 +222,7 @@ package body MPTEST is end if; end if; - TEXT_IO.PUT_LINE( "*** END OF TEST 1 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); diff --git a/testsuites/ada/mptests/mp03/config_base.h b/testsuites/ada/mptests/mp03/config_base.h index 2559d1a9ae..9a1c49ebaf 100644 --- a/testsuites/ada/mptests/mp03/config_base.h +++ b/testsuites/ada/mptests/mp03/config_base.h @@ -20,6 +20,8 @@ #define CONFIGURE_MAXIMUM_TASKS 2 +#define ADA_TEST_NAME "ADA MP 3" + #define CONFIGURE_MAXIMUM_POSIX_THREADS 10 #define CONFIGURE_MAXIMUM_POSIX_KEYS 10 diff --git a/testsuites/ada/mptests/mp03/mptest.adb b/testsuites/ada/mptests/mp03/mptest.adb index 170b62fd5d..821512e175 100644 --- a/testsuites/ada/mptests/mp03/mptest.adb +++ b/testsuites/ada/mptests/mp03/mptest.adb @@ -36,7 +36,8 @@ package body MPTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT( "*** TEST 3 -- NODE " ); + TEST_SUPPORT.ADA_TEST_BEGIN; + TEXT_IO.PUT( "*** NODE " ); UNSIGNED32_IO.PUT( TEST_SUPPORT.NODE, WIDTH => 1 @@ -167,7 +168,7 @@ package body MPTEST is MPTEST.TEST_TASK_SUPPORT( 2 ); - TEXT_IO.PUT_LINE( "*** END OF TEST 3 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); diff --git a/testsuites/ada/mptests/mp04/config_base.h b/testsuites/ada/mptests/mp04/config_base.h index 2559d1a9ae..71aca5305a 100644 --- a/testsuites/ada/mptests/mp04/config_base.h +++ b/testsuites/ada/mptests/mp04/config_base.h @@ -20,6 +20,8 @@ #define CONFIGURE_MAXIMUM_TASKS 2 +#define ADA_TEST_NAME "ADA MP 4" + #define CONFIGURE_MAXIMUM_POSIX_THREADS 10 #define CONFIGURE_MAXIMUM_POSIX_KEYS 10 diff --git a/testsuites/ada/mptests/mp04/mptest.adb b/testsuites/ada/mptests/mp04/mptest.adb index a7a2bdd3ea..f888a4b324 100644 --- a/testsuites/ada/mptests/mp04/mptest.adb +++ b/testsuites/ada/mptests/mp04/mptest.adb @@ -38,7 +38,8 @@ package body MPTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT( "*** TEST 4 -- NODE " ); + TEST_SUPPORT.ADA_TEST_BEGIN; + TEXT_IO.PUT( "*** NODE " ); UNSIGNED32_IO.PUT( TEST_SUPPORT.NODE, WIDTH => 1 @@ -154,7 +155,7 @@ package body MPTEST is TEXT_IO.PUT_LINE( "Local task priority has been set" ); - TEXT_IO.PUT_LINE( "*** END OF TEST 4 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); diff --git a/testsuites/ada/mptests/mp05/config_base.h b/testsuites/ada/mptests/mp05/config_base.h index 2559d1a9ae..2728ab2889 100644 --- a/testsuites/ada/mptests/mp05/config_base.h +++ b/testsuites/ada/mptests/mp05/config_base.h @@ -20,6 +20,8 @@ #define CONFIGURE_MAXIMUM_TASKS 2 +#define ADA_TEST_NAME "ADA MP 5" + #define CONFIGURE_MAXIMUM_POSIX_THREADS 10 #define CONFIGURE_MAXIMUM_POSIX_KEYS 10 diff --git a/testsuites/ada/mptests/mp05/mptest.adb b/testsuites/ada/mptests/mp05/mptest.adb index a206b80b85..a5c0818594 100644 --- a/testsuites/ada/mptests/mp05/mptest.adb +++ b/testsuites/ada/mptests/mp05/mptest.adb @@ -41,7 +41,8 @@ package body MPTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT( "*** TEST 5 -- NODE " ); + TEST_SUPPORT.ADA_TEST_BEGIN; + TEXT_IO.PUT( "*** NODE " ); UNSIGNED32_IO.PUT( TEST_SUPPORT.NODE, WIDTH => 1 @@ -238,7 +239,7 @@ package body MPTEST is end loop; TEXT_IO.NEW_LINE; - TEXT_IO.PUT_LINE( "*** END OF TEST 5 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); diff --git a/testsuites/ada/mptests/mp06/config_base.h b/testsuites/ada/mptests/mp06/config_base.h index 2559d1a9ae..f3e3972e79 100644 --- a/testsuites/ada/mptests/mp06/config_base.h +++ b/testsuites/ada/mptests/mp06/config_base.h @@ -20,6 +20,8 @@ #define CONFIGURE_MAXIMUM_TASKS 2 +#define ADA_TEST_NAME "ADA MP 6" + #define CONFIGURE_MAXIMUM_POSIX_THREADS 10 #define CONFIGURE_MAXIMUM_POSIX_KEYS 10 diff --git a/testsuites/ada/mptests/mp06/mptest.adb b/testsuites/ada/mptests/mp06/mptest.adb index d4522e653b..378d46f8f7 100644 --- a/testsuites/ada/mptests/mp06/mptest.adb +++ b/testsuites/ada/mptests/mp06/mptest.adb @@ -40,7 +40,8 @@ package body MPTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT( "*** TEST 6 -- NODE " ); + TEST_SUPPORT.ADA_TEST_BEGIN; + TEXT_IO.PUT( "*** NODE " ); UNSIGNED32_IO.PUT( TEST_SUPPORT.NODE, WIDTH => 1 @@ -243,7 +244,7 @@ package body MPTEST is end if; - TEXT_IO.PUT_LINE( "*** END OF TEST 6 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); diff --git a/testsuites/ada/mptests/mp07/config_base.h b/testsuites/ada/mptests/mp07/config_base.h index 2559d1a9ae..7df48cd193 100644 --- a/testsuites/ada/mptests/mp07/config_base.h +++ b/testsuites/ada/mptests/mp07/config_base.h @@ -20,6 +20,8 @@ #define CONFIGURE_MAXIMUM_TASKS 2 +#define ADA_TEST_NAME "ADA MP 7" + #define CONFIGURE_MAXIMUM_POSIX_THREADS 10 #define CONFIGURE_MAXIMUM_POSIX_KEYS 10 diff --git a/testsuites/ada/mptests/mp07/mptest.adb b/testsuites/ada/mptests/mp07/mptest.adb index 20dbc9cd84..7354e56791 100644 --- a/testsuites/ada/mptests/mp07/mptest.adb +++ b/testsuites/ada/mptests/mp07/mptest.adb @@ -40,7 +40,8 @@ package body MPTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT( "*** TEST 7 -- NODE " ); + TEST_SUPPORT.ADA_TEST_BEGIN; + TEXT_IO.PUT( "*** NODE " ); UNSIGNED32_IO.PUT( TEST_SUPPORT.NODE, WIDTH => 1 @@ -195,7 +196,7 @@ package body MPTEST is TEXT_IO.NEW_LINE; - TEXT_IO.PUT_LINE( "*** END OF TEST 7 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); diff --git a/testsuites/ada/mptests/mp08/config_base.h b/testsuites/ada/mptests/mp08/config_base.h index 2559d1a9ae..74367e7406 100644 --- a/testsuites/ada/mptests/mp08/config_base.h +++ b/testsuites/ada/mptests/mp08/config_base.h @@ -20,6 +20,8 @@ #define CONFIGURE_MAXIMUM_TASKS 2 +#define ADA_TEST_NAME "ADA MP 8" + #define CONFIGURE_MAXIMUM_POSIX_THREADS 10 #define CONFIGURE_MAXIMUM_POSIX_KEYS 10 diff --git a/testsuites/ada/mptests/mp08/mptest.adb b/testsuites/ada/mptests/mp08/mptest.adb index 2910ec83e7..a812c0904d 100644 --- a/testsuites/ada/mptests/mp08/mptest.adb +++ b/testsuites/ada/mptests/mp08/mptest.adb @@ -40,7 +40,8 @@ package body MPTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT( "*** TEST 8 -- NODE " ); + TEST_SUPPORT.ADA_TEST_BEGIN; + TEXT_IO.PUT( "*** NODE " ); UNSIGNED32_IO.PUT( TEST_SUPPORT.NODE, WIDTH => 1 @@ -163,7 +164,7 @@ package body MPTEST is TEXT_IO.PUT_LINE( "Global semaphore deleted" ); - TEXT_IO.PUT_LINE( "*** END OF TEST 8 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); @@ -184,7 +185,7 @@ package body MPTEST is RTEMS.SEMAPHORE.DELETE( MPTEST.SEMAPHORE_ID( 1 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_DELETE" ); - TEXT_IO.PUT_LINE( "*** END OF TEST 8 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); diff --git a/testsuites/ada/mptests/mp09/config_base.h b/testsuites/ada/mptests/mp09/config_base.h index 2559d1a9ae..8145297471 100644 --- a/testsuites/ada/mptests/mp09/config_base.h +++ b/testsuites/ada/mptests/mp09/config_base.h @@ -20,6 +20,8 @@ #define CONFIGURE_MAXIMUM_TASKS 2 +#define ADA_TEST_NAME "ADA MP 9" + #define CONFIGURE_MAXIMUM_POSIX_THREADS 10 #define CONFIGURE_MAXIMUM_POSIX_KEYS 10 diff --git a/testsuites/ada/mptests/mp09/mptest.adb b/testsuites/ada/mptests/mp09/mptest.adb index f68268788d..742f059d9d 100644 --- a/testsuites/ada/mptests/mp09/mptest.adb +++ b/testsuites/ada/mptests/mp09/mptest.adb @@ -40,7 +40,8 @@ package body MPTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT( "*** TEST 9 -- NODE " ); + TEST_SUPPORT.ADA_TEST_BEGIN; + TEXT_IO.PUT( "*** NODE " ); UNSIGNED32_IO.PUT( TEST_SUPPORT.NODE, WIDTH => 1 @@ -364,7 +365,7 @@ package body MPTEST is end if; - TEXT_IO.PUT_LINE( "*** END OF TEST 9 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); diff --git a/testsuites/ada/mptests/mp10/config_base.h b/testsuites/ada/mptests/mp10/config_base.h index 2559d1a9ae..72f5c759ba 100644 --- a/testsuites/ada/mptests/mp10/config_base.h +++ b/testsuites/ada/mptests/mp10/config_base.h @@ -20,6 +20,8 @@ #define CONFIGURE_MAXIMUM_TASKS 2 +#define ADA_TEST_NAME "ADA MP 10" + #define CONFIGURE_MAXIMUM_POSIX_THREADS 10 #define CONFIGURE_MAXIMUM_POSIX_KEYS 10 diff --git a/testsuites/ada/mptests/mp10/mptest.adb b/testsuites/ada/mptests/mp10/mptest.adb index d773976a3e..a105fe8ca6 100644 --- a/testsuites/ada/mptests/mp10/mptest.adb +++ b/testsuites/ada/mptests/mp10/mptest.adb @@ -40,7 +40,8 @@ package body MPTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT( "*** TEST 10 -- NODE " ); + TEST_SUPPORT.ADA_TEST_BEGIN; + TEXT_IO.PUT( "*** NODE " ); UNSIGNED32_IO.PUT( TEST_SUPPORT.NODE, WIDTH => 1 @@ -164,7 +165,7 @@ package body MPTEST is end if; - TEXT_IO.PUT_LINE( "*** END OF TEST 10 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); diff --git a/testsuites/ada/mptests/mp11/config_base.h b/testsuites/ada/mptests/mp11/config_base.h index 2559d1a9ae..c36c1bac3c 100644 --- a/testsuites/ada/mptests/mp11/config_base.h +++ b/testsuites/ada/mptests/mp11/config_base.h @@ -20,6 +20,8 @@ #define CONFIGURE_MAXIMUM_TASKS 2 +#define ADA_TEST_NAME "ADA MP 11" + #define CONFIGURE_MAXIMUM_POSIX_THREADS 10 #define CONFIGURE_MAXIMUM_POSIX_KEYS 10 diff --git a/testsuites/ada/mptests/mp11/mptest.adb b/testsuites/ada/mptests/mp11/mptest.adb index 9ad9f52fca..95b6904311 100644 --- a/testsuites/ada/mptests/mp11/mptest.adb +++ b/testsuites/ada/mptests/mp11/mptest.adb @@ -41,7 +41,8 @@ package body MPTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT( "*** TEST 11 -- NODE " ); + TEST_SUPPORT.ADA_TEST_BEGIN; + TEXT_IO.PUT( "*** NODE " ); UNSIGNED32_IO.PUT( TEST_SUPPORT.NODE, WIDTH => 1 @@ -127,7 +128,7 @@ package body MPTEST is end if; - TEXT_IO.PUT_LINE( "*** END OF TEST 11 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); diff --git a/testsuites/ada/mptests/mp12/config_base.h b/testsuites/ada/mptests/mp12/config_base.h index 2559d1a9ae..2d7952fe39 100644 --- a/testsuites/ada/mptests/mp12/config_base.h +++ b/testsuites/ada/mptests/mp12/config_base.h @@ -20,6 +20,8 @@ #define CONFIGURE_MAXIMUM_TASKS 2 +#define ADA_TEST_NAME "ADA MP 12" + #define CONFIGURE_MAXIMUM_POSIX_THREADS 10 #define CONFIGURE_MAXIMUM_POSIX_KEYS 10 diff --git a/testsuites/ada/mptests/mp12/mptest.adb b/testsuites/ada/mptests/mp12/mptest.adb index 74dd2e86bd..46f474fd5b 100644 --- a/testsuites/ada/mptests/mp12/mptest.adb +++ b/testsuites/ada/mptests/mp12/mptest.adb @@ -40,7 +40,8 @@ package body MPTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT( "*** TEST 12 -- NODE " ); + TEST_SUPPORT.ADA_TEST_BEGIN; + TEXT_IO.PUT( "*** NODE " ); UNSIGNED32_IO.PUT( TEST_SUPPORT.NODE, WIDTH => 1 @@ -139,7 +140,7 @@ package body MPTEST is end if; - TEXT_IO.PUT_LINE( "*** END OF TEST 12 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); diff --git a/testsuites/ada/mptests/mp13/config_base.h b/testsuites/ada/mptests/mp13/config_base.h index 2559d1a9ae..8799c9a86e 100644 --- a/testsuites/ada/mptests/mp13/config_base.h +++ b/testsuites/ada/mptests/mp13/config_base.h @@ -20,6 +20,8 @@ #define CONFIGURE_MAXIMUM_TASKS 2 +#define ADA_TEST_NAME "ADA MP 13" + #define CONFIGURE_MAXIMUM_POSIX_THREADS 10 #define CONFIGURE_MAXIMUM_POSIX_KEYS 10 diff --git a/testsuites/ada/mptests/mp13/mptest.adb b/testsuites/ada/mptests/mp13/mptest.adb index 6dc79ab486..a1b33551ff 100644 --- a/testsuites/ada/mptests/mp13/mptest.adb +++ b/testsuites/ada/mptests/mp13/mptest.adb @@ -40,7 +40,8 @@ package body MPTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT( "*** TEST 13 -- NODE " ); + TEST_SUPPORT.ADA_TEST_BEGIN; + TEXT_IO.PUT( "*** NODE " ); UNSIGNED32_IO.PUT( TEST_SUPPORT.NODE, WIDTH => 1 @@ -133,7 +134,7 @@ package body MPTEST is RTEMS.TASKS.WAKE_AFTER( 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" ); - TEXT_IO.PUT_LINE( "*** END OF TEST 13 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); @@ -314,7 +315,7 @@ package body MPTEST is ); TEXT_IO.PUT_LINE( "semaphore_obtain correctly returned TIMEOUT" ); - TEXT_IO.PUT_LINE( "*** END OF TEST 13 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); diff --git a/testsuites/ada/mptests/mp14/config_base.h b/testsuites/ada/mptests/mp14/config_base.h index 2559d1a9ae..6d2b79dea5 100644 --- a/testsuites/ada/mptests/mp14/config_base.h +++ b/testsuites/ada/mptests/mp14/config_base.h @@ -20,6 +20,8 @@ #define CONFIGURE_MAXIMUM_TASKS 2 +#define ADA_TEST_NAME "ADA MP 14" + #define CONFIGURE_MAXIMUM_POSIX_THREADS 10 #define CONFIGURE_MAXIMUM_POSIX_KEYS 10 diff --git a/testsuites/ada/mptests/mp14/mptest.adb b/testsuites/ada/mptests/mp14/mptest.adb index c795dc28bd..248ef9f2ad 100644 --- a/testsuites/ada/mptests/mp14/mptest.adb +++ b/testsuites/ada/mptests/mp14/mptest.adb @@ -82,7 +82,8 @@ package body MPTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT( "*** TEST 14 -- NODE " ); + TEST_SUPPORT.ADA_TEST_BEGIN; + TEXT_IO.PUT( "*** NODE " ); UNSIGNED32_IO.PUT( TEST_SUPPORT.NODE, WIDTH => 1 diff --git a/testsuites/ada/samples/base_mp/config.h b/testsuites/ada/samples/base_mp/config.h index 1b73abc7a9..2d0e654f92 100644 --- a/testsuites/ada/samples/base_mp/config.h +++ b/testsuites/ada/samples/base_mp/config.h @@ -20,6 +20,8 @@ #define CONFIGURE_MAXIMUM_TASKS 2 +#define ADA_TEST_NAME "ADA BASE MP" + #define CONFIGURE_POSIX_INIT_THREAD_TABLE #define CONFIGURE_MAXIMUM_POSIX_THREADS 10 diff --git a/testsuites/ada/samples/base_mp/mptest.adb b/testsuites/ada/samples/base_mp/mptest.adb index d4eef0a29f..95e7901d4b 100644 --- a/testsuites/ada/samples/base_mp/mptest.adb +++ b/testsuites/ada/samples/base_mp/mptest.adb @@ -39,7 +39,7 @@ package body MPTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT( "*** SAMPLE MULTIPROCESSOR APPLICATION ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; TEXT_IO.PUT( "Creating and starting an application task" ); @@ -91,7 +91,7 @@ package body MPTEST is UNSIGNED32_IO.PUT( TID, BASE => 16 ); TEXT_IO.NEW_LINE; - TEXT_IO.PUT_LINE( "*** END OF SAMPLE MULTIPROCESSOR APPLICATION ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); diff --git a/testsuites/ada/samples/base_sp/config.h b/testsuites/ada/samples/base_sp/config.h index 74b6d60756..152eb56184 100644 --- a/testsuites/ada/samples/base_sp/config.h +++ b/testsuites/ada/samples/base_sp/config.h @@ -23,6 +23,8 @@ #define CONFIGURE_MAXIMUM_TASKS 2 +#define ADA_TEST_NAME "ADA BASE SP" + #include <rtems/confdefs.h> /* end of include file */ diff --git a/testsuites/ada/samples/base_sp/sptest.adb b/testsuites/ada/samples/base_sp/sptest.adb index 85a847f281..75a472e8d9 100644 --- a/testsuites/ada/samples/base_sp/sptest.adb +++ b/testsuites/ada/samples/base_sp/sptest.adb @@ -36,7 +36,7 @@ package body SPTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** SAMPLE SINGLE PROCESSOR APPLICATION ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; TEXT_IO.PUT_LINE( "Creating and starting an application task" ); SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME( 'T', 'A', '1', ' ' ); @@ -84,7 +84,7 @@ package body SPTEST is UNSIGNED32_IO.PUT( TID, BASE => 16 ); TEXT_IO.NEW_LINE; - TEXT_IO.PUT_LINE( "*** END OF SAMPLE SINGLE PROCESSOR APPLICATION ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); diff --git a/testsuites/ada/samples/hello/config.h b/testsuites/ada/samples/hello/config.h index bab1fc5232..3b4a9f4652 100644 --- a/testsuites/ada/samples/hello/config.h +++ b/testsuites/ada/samples/hello/config.h @@ -26,6 +26,8 @@ #define CONFIGURE_MAXIMUM_TASKS 1 +#define ADA_TEST_NAME "ADA HELLO" + #include <rtems/confdefs.h> /* end of include file */ diff --git a/testsuites/ada/samples/hello/sptest.adb b/testsuites/ada/samples/hello/sptest.adb index 8c29155eba..a0bb90a19e 100644 --- a/testsuites/ada/samples/hello/sptest.adb +++ b/testsuites/ada/samples/hello/sptest.adb @@ -19,6 +19,7 @@ -- with TEXT_IO; +with TEST_SUPPORT; package body SPTEST is @@ -33,9 +34,9 @@ package body SPTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** HELLO WORLD TEST ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; TEXT_IO.PUT_LINE( "Hello World" ); - TEXT_IO.PUT_LINE( "*** END OF HELLO WORLD TEST ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); diff --git a/testsuites/ada/samples/nsecs/config.h b/testsuites/ada/samples/nsecs/config.h index 9f3337801b..61cb8c7392 100644 --- a/testsuites/ada/samples/nsecs/config.h +++ b/testsuites/ada/samples/nsecs/config.h @@ -25,6 +25,8 @@ #define CONFIGURE_MAXIMUM_TASKS 1 +#define ADA_TEST_NAME "ADA NSECS" + #include <rtems/confdefs.h> /* end of include file */ diff --git a/testsuites/ada/samples/nsecs/sptest.adb b/testsuites/ada/samples/nsecs/sptest.adb index 193fa09a45..9befa62c9e 100644 --- a/testsuites/ada/samples/nsecs/sptest.adb +++ b/testsuites/ada/samples/nsecs/sptest.adb @@ -23,6 +23,7 @@ with Interfaces.C; with RTEMS; with RTEMS.Clock; with Text_IO; +with TEST_SUPPORT; use type Interfaces.C.Long; use type RTEMS.Time_T; @@ -69,7 +70,7 @@ package body SPTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** NANOSECOND CLOCK TEST ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; -- -- Iterate 10 times showing difference in TOD @@ -144,7 +145,7 @@ package body SPTEST is delay( 1.0 ); - TEXT_IO.PUT_LINE( "*** END OF NANOSECOND CLOCK TEST ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); diff --git a/testsuites/ada/samples/ticker/config.h b/testsuites/ada/samples/ticker/config.h index 84ec56ffd2..3edc776e54 100644 --- a/testsuites/ada/samples/ticker/config.h +++ b/testsuites/ada/samples/ticker/config.h @@ -23,6 +23,8 @@ #define CONFIGURE_MAXIMUM_TASKS 4 +#define ADA_TEST_NAME "ADA TICKER" + #include <rtems/confdefs.h> /* end of include file */ diff --git a/testsuites/ada/samples/ticker/sptest.adb b/testsuites/ada/samples/ticker/sptest.adb index 2de8b35b79..03f2b1b390 100644 --- a/testsuites/ada/samples/ticker/sptest.adb +++ b/testsuites/ada/samples/ticker/sptest.adb @@ -38,7 +38,7 @@ package body SPTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** TEST 1 ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; TIME := ( 1988, 12, 31, 9, 0, 0, 0 ); @@ -133,7 +133,7 @@ package body SPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET_TOD" ); if TIME.SECOND >= 35 then - TEXT_IO.PUT_LINE( "*** END OF CLOCK TICK TEST ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end if; diff --git a/testsuites/ada/sptests/sp01/config.h b/testsuites/ada/sptests/sp01/config.h index fc9f99dc68..ee9e0fbde5 100644 --- a/testsuites/ada/sptests/sp01/config.h +++ b/testsuites/ada/sptests/sp01/config.h @@ -23,6 +23,8 @@ #define CONFIGURE_MAXIMUM_TASKS 4 +#define ADA_TEST_NAME "ADA SP 1" + #include <rtems/confdefs.h> /* end of include file */ diff --git a/testsuites/ada/sptests/sp01/sptest.adb b/testsuites/ada/sptests/sp01/sptest.adb index 46e48e9b04..eb7497bd9d 100644 --- a/testsuites/ada/sptests/sp01/sptest.adb +++ b/testsuites/ada/sptests/sp01/sptest.adb @@ -38,7 +38,7 @@ package body SPTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** TEST 1 ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; TIME := ( 1988, 12, 31, 9, 0, 0, 0 ); @@ -133,7 +133,7 @@ package body SPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET_TOD" ); if TIME.SECOND >= 35 then - TEXT_IO.PUT_LINE( "*** END OF TEST 1 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end if; diff --git a/testsuites/ada/sptests/sp02/config.h b/testsuites/ada/sptests/sp02/config.h index 84ec56ffd2..60f58c1c13 100644 --- a/testsuites/ada/sptests/sp02/config.h +++ b/testsuites/ada/sptests/sp02/config.h @@ -23,6 +23,8 @@ #define CONFIGURE_MAXIMUM_TASKS 4 +#define ADA_TEST_NAME "ADA SP 2" + #include <rtems/confdefs.h> /* end of include file */ diff --git a/testsuites/ada/sptests/sp02/sptest.adb b/testsuites/ada/sptests/sp02/sptest.adb index 45fb4ac5c2..4534d28d2e 100644 --- a/testsuites/ada/sptests/sp02/sptest.adb +++ b/testsuites/ada/sptests/sp02/sptest.adb @@ -37,7 +37,7 @@ package body SPTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** TEST 2 ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; SPTEST.PREEMPT_TASK_NAME := RTEMS.BUILD_NAME( 'P', 'R', 'M', 'T' ); @@ -281,7 +281,7 @@ package body SPTEST is RTEMS.TASKS.WAKE_AFTER( 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" ); - TEXT_IO.PUT_LINE( "*** END OF TEST 2 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end TASK_1; diff --git a/testsuites/ada/sptests/sp03/config.h b/testsuites/ada/sptests/sp03/config.h index 37acc3c24d..0c7507a3c5 100644 --- a/testsuites/ada/sptests/sp03/config.h +++ b/testsuites/ada/sptests/sp03/config.h @@ -23,6 +23,8 @@ #define CONFIGURE_MAXIMUM_TASKS 3 +#define ADA_TEST_NAME "ADA SP 3" + #include <rtems/confdefs.h> /* end of include file */ diff --git a/testsuites/ada/sptests/sp03/sptest.adb b/testsuites/ada/sptests/sp03/sptest.adb index 24be47eb1c..1a05b51721 100644 --- a/testsuites/ada/sptests/sp03/sptest.adb +++ b/testsuites/ada/sptests/sp03/sptest.adb @@ -37,7 +37,7 @@ package body SPTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** TEST 3 ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME( 'T', 'A', '1', ' ' ); SPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME( 'T', 'A', '2', ' ' ); @@ -154,7 +154,7 @@ package body SPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET_TOD" ); if TIME.SECOND >= 17 then - TEXT_IO.PUT_LINE( "*** END OF TEST 3 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end if; diff --git a/testsuites/ada/sptests/sp04/config.h b/testsuites/ada/sptests/sp04/config.h index bad5bcbeb8..8fccddb09a 100644 --- a/testsuites/ada/sptests/sp04/config.h +++ b/testsuites/ada/sptests/sp04/config.h @@ -26,6 +26,8 @@ #define CONFIGURE_MAXIMUM_TASKS 4 +#define ADA_TEST_NAME "ADA SP 4" + #include <rtems/confdefs.h> /* end of include file */ diff --git a/testsuites/ada/sptests/sp04/sptest.adb b/testsuites/ada/sptests/sp04/sptest.adb index f3955fbb3a..3fcaad18b3 100644 --- a/testsuites/ada/sptests/sp04/sptest.adb +++ b/testsuites/ada/sptests/sp04/sptest.adb @@ -79,7 +79,7 @@ package body SPTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** TEST 4 ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; TIME := ( 1988, 12, 31, 9, 15, 0, 0 ); @@ -264,7 +264,7 @@ package body SPTEST is NULL; END LOOP; Flush_Task_Event_Log; - TEXT_IO.PUT_LINE( "*** END OF TEST 4 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end if; diff --git a/testsuites/ada/sptests/sp05/config.h b/testsuites/ada/sptests/sp05/config.h index 8b7c68e412..d5ddc1d724 100644 --- a/testsuites/ada/sptests/sp05/config.h +++ b/testsuites/ada/sptests/sp05/config.h @@ -25,6 +25,8 @@ #define CONFIGURE_MAXIMUM_TASKS 4 +#define ADA_TEST_NAME "ADA SP 5" + #include <rtems/confdefs.h> /* end of include file */ diff --git a/testsuites/ada/sptests/sp05/sptest.adb b/testsuites/ada/sptests/sp05/sptest.adb index 1a9b974419..00e41e255d 100644 --- a/testsuites/ada/sptests/sp05/sptest.adb +++ b/testsuites/ada/sptests/sp05/sptest.adb @@ -36,7 +36,7 @@ package body SPTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** TEST 5 ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME( 'T', 'A', '1', ' ' ); SPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME( 'T', 'A', '2', ' ' ); @@ -170,7 +170,7 @@ package body SPTEST is end loop; - TEXT_IO.PUT_LINE( "*** END OF TEST 5 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end TASK_1; diff --git a/testsuites/ada/sptests/sp06/config.h b/testsuites/ada/sptests/sp06/config.h index 8b7c68e412..492e0e68be 100644 --- a/testsuites/ada/sptests/sp06/config.h +++ b/testsuites/ada/sptests/sp06/config.h @@ -25,6 +25,8 @@ #define CONFIGURE_MAXIMUM_TASKS 4 +#define ADA_TEST_NAME "ADA SP 6" + #include <rtems/confdefs.h> /* end of include file */ diff --git a/testsuites/ada/sptests/sp06/sptest.adb b/testsuites/ada/sptests/sp06/sptest.adb index f19fd068ee..b3acf7b006 100644 --- a/testsuites/ada/sptests/sp06/sptest.adb +++ b/testsuites/ada/sptests/sp06/sptest.adb @@ -37,7 +37,7 @@ package body SPTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** TEST 6 ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME( 'T', 'A', '1', ' ' ); SPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME( 'T', 'A', '2', ' ' ); @@ -132,7 +132,7 @@ package body SPTEST is PASS := ARGUMENT + 1; if PASS = 5 then - TEXT_IO.PUT_LINE( "*** END OF TEST 6 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end if; diff --git a/testsuites/ada/sptests/sp07/config.h b/testsuites/ada/sptests/sp07/config.h index 4d2ef9f762..ffdac2d224 100644 --- a/testsuites/ada/sptests/sp07/config.h +++ b/testsuites/ada/sptests/sp07/config.h @@ -26,6 +26,8 @@ #define CONFIGURE_MAXIMUM_TASKS 5 +#define ADA_TEST_NAME "ADA SP 7" + #include <rtems/confdefs.h> /* end of include file */ diff --git a/testsuites/ada/sptests/sp07/sptest.adb b/testsuites/ada/sptests/sp07/sptest.adb index d55aa73bf8..e008336065 100644 --- a/testsuites/ada/sptests/sp07/sptest.adb +++ b/testsuites/ada/sptests/sp07/sptest.adb @@ -131,7 +131,7 @@ package body SPTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** TEST 7 ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; SPTEST.EXTENSION_NAME( 1 ) := RTEMS.BUILD_NAME( 'E', 'X', 'T', ' ' ); @@ -419,7 +419,7 @@ package body SPTEST is TEXT_IO.PUT_LINE( "TASK_EXITTED - user extension invoked correctly" ); end if; - TEXT_IO.PUT_LINE( "*** END OF TEST 7 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end TASK_EXIT_EXTENSION; diff --git a/testsuites/ada/sptests/sp08/config.h b/testsuites/ada/sptests/sp08/config.h index 98f7e89d49..af9175713c 100644 --- a/testsuites/ada/sptests/sp08/config.h +++ b/testsuites/ada/sptests/sp08/config.h @@ -25,6 +25,8 @@ #define CONFIGURE_MAXIMUM_TASKS 2 +#define ADA_TEST_NAME "ADA SP 8" + #include <rtems/confdefs.h> /* end of include file */ diff --git a/testsuites/ada/sptests/sp08/sptest.adb b/testsuites/ada/sptests/sp08/sptest.adb index 2bec479285..2a2e994e73 100644 --- a/testsuites/ada/sptests/sp08/sptest.adb +++ b/testsuites/ada/sptests/sp08/sptest.adb @@ -37,7 +37,7 @@ package body SPTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** TEST 8 ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME( 'T', 'A', '1', ' ' ); @@ -339,7 +339,7 @@ package body SPTEST is -- END OF CURRENT MODE - TEXT_IO.PUT_LINE( "*** END OF TEST 8 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end TASK_1; diff --git a/testsuites/ada/sptests/sp09/config.h b/testsuites/ada/sptests/sp09/config.h index 0dac4eca54..4d96170ea0 100644 --- a/testsuites/ada/sptests/sp09/config.h +++ b/testsuites/ada/sptests/sp09/config.h @@ -17,6 +17,8 @@ #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER #define CONFIGURE_MAXIMUM_TASKS 10 + +#define ADA_TEST_NAME "ADA SP 9" #define CONFIGURE_MAXIMUM_TIMERS 1 #define CONFIGURE_MAXIMUM_SEMAPHORES 2 #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1 diff --git a/testsuites/ada/sptests/sp09/sptest.adb b/testsuites/ada/sptests/sp09/sptest.adb index 218fbaed49..e064ebef90 100644 --- a/testsuites/ada/sptests/sp09/sptest.adb +++ b/testsuites/ada/sptests/sp09/sptest.adb @@ -45,7 +45,7 @@ package body SPTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** TEST 9 ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME( 'T', 'A', '1', ' ' ); SPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME( 'T', 'A', '2', ' ' ); @@ -2984,7 +2984,7 @@ package body SPTEST is SPTEST.SCREEN_14; - TEXT_IO.PUT_LINE( "*** END OF TEST 9 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end TASK_1; diff --git a/testsuites/ada/sptests/sp11/config.h b/testsuites/ada/sptests/sp11/config.h index 97513d5a29..508613e314 100644 --- a/testsuites/ada/sptests/sp11/config.h +++ b/testsuites/ada/sptests/sp11/config.h @@ -17,6 +17,8 @@ #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER #define CONFIGURE_MAXIMUM_TASKS 3 + +#define ADA_TEST_NAME "ADA SP 11" #define CONFIGURE_MAXIMUM_TIMERS 6 #define CONFIGURE_TICKS_PER_TIMESLICE 100 diff --git a/testsuites/ada/sptests/sp11/sptest.adb b/testsuites/ada/sptests/sp11/sptest.adb index 95dd17846b..fa6e139367 100644 --- a/testsuites/ada/sptests/sp11/sptest.adb +++ b/testsuites/ada/sptests/sp11/sptest.adb @@ -40,7 +40,7 @@ package body SPTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** TEST 11 ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME( 'T', 'A', '1', ' ' ); SPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME( 'T', 'A', '2', ' ' ); @@ -623,7 +623,7 @@ package body SPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_AFTER 200 ticks" ); - TEXT_IO.PUT_LINE( "*** END OF TEST 11 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end TASK_1; diff --git a/testsuites/ada/sptests/sp12/config.h b/testsuites/ada/sptests/sp12/config.h index da366f9b85..8edb8baf90 100644 --- a/testsuites/ada/sptests/sp12/config.h +++ b/testsuites/ada/sptests/sp12/config.h @@ -17,6 +17,8 @@ #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER #define CONFIGURE_MAXIMUM_TASKS 8 + +#define ADA_TEST_NAME "ADA SP 12" #define CONFIGURE_MAXIMUM_SEMAPHORES 10 #define CONFIGURE_TICKS_PER_TIMESLICE 100 diff --git a/testsuites/ada/sptests/sp12/sptest.adb b/testsuites/ada/sptests/sp12/sptest.adb index c1d9f627f8..a1391ab01d 100644 --- a/testsuites/ada/sptests/sp12/sptest.adb +++ b/testsuites/ada/sptests/sp12/sptest.adb @@ -38,7 +38,7 @@ package body SPTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** TEST 12 ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME( 'T', 'A', '1', ' ' ); SPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME( 'T', 'A', '2', ' ' ); @@ -801,7 +801,7 @@ TEST_SUPPORT.PAUSE; ); TEXT_IO.PUT_LINE( "TA5 - SM1 deleted by TA1" ); - TEXT_IO.PUT_LINE( "*** END OF TEST 12 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end TASK_5; diff --git a/testsuites/ada/sptests/sp13/config.h b/testsuites/ada/sptests/sp13/config.h index d31a29d3f0..2d6dd34f1f 100644 --- a/testsuites/ada/sptests/sp13/config.h +++ b/testsuites/ada/sptests/sp13/config.h @@ -17,6 +17,8 @@ #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER #define CONFIGURE_MAXIMUM_TASKS 4 + +#define ADA_TEST_NAME "ADA SP 13" #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 10 #define CONFIGURE_TICKS_PER_TIMESLICE 100 diff --git a/testsuites/ada/sptests/sp13/sptest.adb b/testsuites/ada/sptests/sp13/sptest.adb index 7b61b9e7ba..96b74618b7 100644 --- a/testsuites/ada/sptests/sp13/sptest.adb +++ b/testsuites/ada/sptests/sp13/sptest.adb @@ -43,7 +43,7 @@ package body SPTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** TEST 13 ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME( 'T', 'A', '1', ' ' ); SPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME( 'T', 'A', '2', ' ' ); @@ -678,7 +678,7 @@ TEST_SUPPORT.PAUSE; TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "message_queue_delete" ); end loop; - TEXT_IO.PUT_LINE( "*** END OF TEST 13 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end TASK_1; diff --git a/testsuites/ada/sptests/sp14/config.h b/testsuites/ada/sptests/sp14/config.h index 4a0cc4e0f2..2a53074581 100644 --- a/testsuites/ada/sptests/sp14/config.h +++ b/testsuites/ada/sptests/sp14/config.h @@ -17,6 +17,8 @@ #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER #define CONFIGURE_MAXIMUM_TASKS 3 + +#define ADA_TEST_NAME "ADA SP 14" #define CONFIGURE_MAXIMUM_TIMERS 1 #define CONFIGURE_TICKS_PER_TIMESLICE 100 diff --git a/testsuites/ada/sptests/sp14/sptest.adb b/testsuites/ada/sptests/sp14/sptest.adb index 3b74c9f256..eb9ff3c34a 100644 --- a/testsuites/ada/sptests/sp14/sptest.adb +++ b/testsuites/ada/sptests/sp14/sptest.adb @@ -40,7 +40,7 @@ package body SPTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** TEST 14 ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME( 'T', 'A', '1', ' ' ); SPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME( 'T', 'A', '2', ' ' ); @@ -277,7 +277,7 @@ package body SPTEST is RTEMS.TASKS.WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER YIELD" ); - TEXT_IO.PUT_LINE( "*** END OF TEST 14 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end TASK_2; diff --git a/testsuites/ada/sptests/sp15/config.h b/testsuites/ada/sptests/sp15/config.h index 35e7e3a81a..b0d535c347 100644 --- a/testsuites/ada/sptests/sp15/config.h +++ b/testsuites/ada/sptests/sp15/config.h @@ -17,6 +17,8 @@ #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER #define CONFIGURE_MAXIMUM_TASKS 2 + +#define ADA_TEST_NAME "ADA SP 15" #define CONFIGURE_MAXIMUM_PARTITIONS 2 #define CONFIGURE_TICKS_PER_TIMESLICE 100 diff --git a/testsuites/ada/sptests/sp15/sptest.adb b/testsuites/ada/sptests/sp15/sptest.adb index 39e887dd2f..8f83defedf 100644 --- a/testsuites/ada/sptests/sp15/sptest.adb +++ b/testsuites/ada/sptests/sp15/sptest.adb @@ -37,7 +37,7 @@ package body SPTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** TEST 15 ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME( 'T', 'A', '1', ' ' ); @@ -270,7 +270,7 @@ package body SPTEST is RTEMS.PARTITION.DELETE( SPTEST.PARTITION_ID( 2 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PARTITION_DELETE OF SELF" ); - TEXT_IO.PUT_LINE( "*** END OF TEST 15 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end TASK_1; diff --git a/testsuites/ada/sptests/sp16/config.h b/testsuites/ada/sptests/sp16/config.h index 4b5fae9b87..c50733678e 100644 --- a/testsuites/ada/sptests/sp16/config.h +++ b/testsuites/ada/sptests/sp16/config.h @@ -17,6 +17,8 @@ #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER #define CONFIGURE_MAXIMUM_TASKS 4 + +#define ADA_TEST_NAME "ADA SP 16" #define CONFIGURE_MAXIMUM_REGIONS 4 #define CONFIGURE_TICKS_PER_TIMESLICE 100 diff --git a/testsuites/ada/sptests/sp16/sptest.adb b/testsuites/ada/sptests/sp16/sptest.adb index a62eedd104..44d65badfc 100644 --- a/testsuites/ada/sptests/sp16/sptest.adb +++ b/testsuites/ada/sptests/sp16/sptest.adb @@ -38,7 +38,7 @@ package body SPTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** TEST 16 ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME( 'T', 'A', '1', ' ' ); SPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME( 'T', 'A', '2', ' ' ); @@ -530,7 +530,7 @@ TEST_SUPPORT.PAUSE; RTEMS.REGION.DELETE( SPTEST.REGION_ID( 4 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( status, "region_delete" ); - TEXT_IO.PUT_LINE( "*** END OF TEST 16 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end TASK_1; diff --git a/testsuites/ada/sptests/sp17/config.h b/testsuites/ada/sptests/sp17/config.h index df15364ff6..9813e25d25 100644 --- a/testsuites/ada/sptests/sp17/config.h +++ b/testsuites/ada/sptests/sp17/config.h @@ -17,6 +17,8 @@ #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER #define CONFIGURE_MAXIMUM_TASKS 3 + +#define ADA_TEST_NAME "ADA SP 17" #define CONFIGURE_MICROSECONDS_PER_TICK RTEMS_MILLISECONDS_TO_MICROSECONDS(25) #define CONFIGURE_TICKS_PER_TIMESLICE 1000 diff --git a/testsuites/ada/sptests/sp17/sptest.adb b/testsuites/ada/sptests/sp17/sptest.adb index e2402a50cf..880f5db4a7 100644 --- a/testsuites/ada/sptests/sp17/sptest.adb +++ b/testsuites/ada/sptests/sp17/sptest.adb @@ -37,7 +37,7 @@ package body SPTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** TEST 17 ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME( 'T', 'A', '1', ' ' ); SPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME( 'T', 'A', '2', ' ' ); @@ -136,7 +136,7 @@ package body SPTEST is TEXT_IO.PUT_LINE( "TA1 - Got Back!!!" ); - TEXT_IO.PUT_LINE( "*** END OF TEST 17 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end TASK_1; diff --git a/testsuites/ada/sptests/sp19/config.h b/testsuites/ada/sptests/sp19/config.h index a3e24eeb42..1cdc8a05d2 100644 --- a/testsuites/ada/sptests/sp19/config.h +++ b/testsuites/ada/sptests/sp19/config.h @@ -23,6 +23,8 @@ #define CONFIGURE_MAXIMUM_TASKS 7 +#define ADA_TEST_NAME "ADA SP 19" + #include <rtems/confdefs.h> /* end of include file */ diff --git a/testsuites/ada/sptests/sp19/sptest.adp b/testsuites/ada/sptests/sp19/sptest.adp index d49bf41aac..4c36691e5d 100644 --- a/testsuites/ada/sptests/sp19/sptest.adp +++ b/testsuites/ada/sptests/sp19/sptest.adp @@ -38,7 +38,7 @@ package body SPTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** TEST 19 ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME( 'T', 'A', '1', ' ' ); SPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME( 'T', 'A', '2', ' ' ); @@ -313,7 +313,7 @@ package body SPTEST is RTEMS.TASKS.DELETE( SPTEST.TASK_ID( 3 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF TA3" ); - TEXT_IO.PUT_LINE( "*** END OF TEST 19 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end if; diff --git a/testsuites/ada/sptests/sp20/config.h b/testsuites/ada/sptests/sp20/config.h index a80d846356..f509a8163d 100644 --- a/testsuites/ada/sptests/sp20/config.h +++ b/testsuites/ada/sptests/sp20/config.h @@ -17,6 +17,8 @@ #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER #define CONFIGURE_MAXIMUM_TASKS 7 + +#define ADA_TEST_NAME "ADA SP 20" #define CONFIGURE_MAXIMUM_PERIODS 10 #define CONFIGURE_POSIX_INIT_THREAD_TABLE diff --git a/testsuites/ada/sptests/sp20/sptest.adb b/testsuites/ada/sptests/sp20/sptest.adb index 1929fd958f..e5ad87295c 100644 --- a/testsuites/ada/sptests/sp20/sptest.adb +++ b/testsuites/ada/sptests/sp20/sptest.adb @@ -39,7 +39,7 @@ package body SPTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** TEST 20 ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME( 'T', 'A', '1', ' ' ); SPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME( 'T', 'A', '2', ' ' ); @@ -225,7 +225,7 @@ package body SPTEST is TEXT_IO.PUT_LINE( ")" ); if PASS = 10 then - TEXT_IO.PUT_LINE( "*** END OF TEST 20 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end if; diff --git a/testsuites/ada/sptests/sp22/config.h b/testsuites/ada/sptests/sp22/config.h index acbcae6bdd..da60e49360 100644 --- a/testsuites/ada/sptests/sp22/config.h +++ b/testsuites/ada/sptests/sp22/config.h @@ -17,6 +17,8 @@ #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER #define CONFIGURE_MAXIMUM_TASKS 2 + +#define ADA_TEST_NAME "ADA SP 22" #define CONFIGURE_MAXIMUM_TIMERS 2 #define CONFIGURE_POSIX_INIT_THREAD_TABLE diff --git a/testsuites/ada/sptests/sp22/sptest.adb b/testsuites/ada/sptests/sp22/sptest.adb index a947628db5..3cf4baa2bd 100644 --- a/testsuites/ada/sptests/sp22/sptest.adb +++ b/testsuites/ada/sptests/sp22/sptest.adb @@ -40,7 +40,7 @@ package body SPTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** TEST 22 ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; TIME := ( 1988, 12, 31, 9, 0, 0, 0 ); @@ -289,7 +289,7 @@ TEST_SUPPORT.PAUSE; RTEMS.TIMER.DELETE( TMID, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_DELETE" ); - TEXT_IO.PUT_LINE( "*** END OF TEST 22 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end TASK_1; diff --git a/testsuites/ada/sptests/sp23/config.h b/testsuites/ada/sptests/sp23/config.h index ba9b9f5a24..5af9f6244d 100644 --- a/testsuites/ada/sptests/sp23/config.h +++ b/testsuites/ada/sptests/sp23/config.h @@ -17,6 +17,8 @@ #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER #define CONFIGURE_MAXIMUM_TASKS 2 + +#define ADA_TEST_NAME "ADA SP 23" #define CONFIGURE_MAXIMUM_PORTS 1 #define CONFIGURE_POSIX_INIT_THREAD_TABLE diff --git a/testsuites/ada/sptests/sp23/sptest.adb b/testsuites/ada/sptests/sp23/sptest.adb index e3a2871ab6..4e88421ec7 100644 --- a/testsuites/ada/sptests/sp23/sptest.adb +++ b/testsuites/ada/sptests/sp23/sptest.adb @@ -40,7 +40,7 @@ package body SPTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** TEST 23 ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME( 'T', 'A', '1', ' ' ); @@ -167,7 +167,7 @@ package body SPTEST is RTEMS.PORT.DELETE( SPTEST.PORT_ID( 1 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PORT_DELETE" ); - TEXT_IO.PUT_LINE( "*** END OF TEST 23 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end TASK_1; diff --git a/testsuites/ada/sptests/sp24/config.h b/testsuites/ada/sptests/sp24/config.h index 7ed712a491..ee18ff3fac 100644 --- a/testsuites/ada/sptests/sp24/config.h +++ b/testsuites/ada/sptests/sp24/config.h @@ -17,6 +17,8 @@ #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER #define CONFIGURE_MAXIMUM_TASKS 4 + +#define ADA_TEST_NAME "ADA SP 24" #define CONFIGURE_MAXIMUM_TIMERS 3 #define CONFIGURE_POSIX_INIT_THREAD_TABLE diff --git a/testsuites/ada/sptests/sp24/sptest.adb b/testsuites/ada/sptests/sp24/sptest.adb index 4245036995..af255e4d73 100644 --- a/testsuites/ada/sptests/sp24/sptest.adb +++ b/testsuites/ada/sptests/sp24/sptest.adb @@ -39,7 +39,7 @@ package body SPTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** TEST 24 ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; TIME := ( 1988, 12, 31, 9, 0, 0, 0 ); @@ -145,7 +145,7 @@ package body SPTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET_TOD" ); if TIME.SECOND >= 35 then - TEXT_IO.PUT_LINE( "*** END OF TEST 24 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end if; diff --git a/testsuites/ada/sptests/sp25/config.h b/testsuites/ada/sptests/sp25/config.h index 9d6155f869..d7c6c19cb5 100644 --- a/testsuites/ada/sptests/sp25/config.h +++ b/testsuites/ada/sptests/sp25/config.h @@ -17,6 +17,8 @@ #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER #define CONFIGURE_MAXIMUM_TASKS 2 + +#define ADA_TEST_NAME "ADA SP 25" #define CONFIGURE_MAXIMUM_REGIONS 1 #define CONFIGURE_POSIX_INIT_THREAD_TABLE diff --git a/testsuites/ada/sptests/sp25/sptest.adb b/testsuites/ada/sptests/sp25/sptest.adb index 1fb103e966..1fff4c0cdb 100644 --- a/testsuites/ada/sptests/sp25/sptest.adb +++ b/testsuites/ada/sptests/sp25/sptest.adb @@ -37,7 +37,7 @@ package body SPTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** TEST 25 ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME( 'T', 'A', '1', ' ' ); @@ -354,7 +354,7 @@ TEST_SUPPORT.PAUSE; RTEMS.REGION.DELETE( SPTEST.REGION_ID( 1 ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_DELETE OF RN1" ); - TEXT_IO.PUT_LINE( "*** END OF TEST 25 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end TASK_1; diff --git a/testsuites/ada/sptests/spatcb01/config.h b/testsuites/ada/sptests/spatcb01/config.h index 530f0dddf8..dad989dbe4 100644 --- a/testsuites/ada/sptests/spatcb01/config.h +++ b/testsuites/ada/sptests/spatcb01/config.h @@ -13,4 +13,6 @@ #define CONFIGURE_MAXIMUM_POSIX_THREADS 1 +#define ADA_TEST_NAME "ADA SPATCB 1" + #include <rtems/confdefs.h> diff --git a/testsuites/ada/sptests/spatcb01/spatcb01.adb b/testsuites/ada/sptests/spatcb01/spatcb01.adb index 19aaa8031f..810446f871 100644 --- a/testsuites/ada/sptests/spatcb01/spatcb01.adb +++ b/testsuites/ada/sptests/spatcb01/spatcb01.adb @@ -14,13 +14,14 @@ -- with TEXT_IO; +with TEST_SUPPORT; with System.Task_Primitives.Operations; with System.Tasking; procedure SPATCB01 is Self_Id : constant System.Tasking.Task_Id := System.Task_Primitives.Operations.Self; begin - TEXT_IO.PUT_LINE( "*** BEGIN OF TEST SPATCB 1 ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; TEXT_IO.PUT_LINE( Self_Id.Common.Task_Image( 1 .. Self_Id.Common.Task_Image_Len ) ); - TEXT_IO.PUT_LINE( "*** END OF TEST SPATCB 1 ***" ); + TEST_SUPPORT.ADA_TEST_END; end SPATCB01; diff --git a/testsuites/ada/sptests/spname01/config.h b/testsuites/ada/sptests/spname01/config.h index bab1fc5232..8316f41e0c 100644 --- a/testsuites/ada/sptests/spname01/config.h +++ b/testsuites/ada/sptests/spname01/config.h @@ -26,6 +26,8 @@ #define CONFIGURE_MAXIMUM_TASKS 1 +#define ADA_TEST_NAME "ADA SPNAME 1" + #include <rtems/confdefs.h> /* end of include file */ diff --git a/testsuites/ada/sptests/spname01/sptest.adb b/testsuites/ada/sptests/spname01/sptest.adb index 5dd78d8e4a..108ff3b999 100644 --- a/testsuites/ada/sptests/spname01/sptest.adb +++ b/testsuites/ada/sptests/spname01/sptest.adb @@ -33,7 +33,7 @@ package body SPTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** Ada Task Name TEST ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; RTEMS.Object_Get_Name( RTEMS.Self, StringName, Pointer ); if Pointer = RTEMS.Null_Address then @@ -53,7 +53,7 @@ package body SPTEST is TEXT_IO.PUT_LINE( "My name is (" & StringName & ")" ); end if; - TEXT_IO.PUT_LINE( "*** END OF Ada Task Name TEST ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); diff --git a/testsuites/ada/support/init.c b/testsuites/ada/support/init.c index 968b17b3a4..9c10aabca5 100644 --- a/testsuites/ada/support/init.c +++ b/testsuites/ada/support/init.c @@ -3,9 +3,9 @@ * On-Line Applications Research Corporation (OAR). */ -#include <bsp.h> #include <stdlib.h> +#include <rtems/test.h> #include <rtems/score/threadimpl.h> /* @@ -26,6 +26,8 @@ static void *POSIX_Init( * Prototypes for various test support routines. Since these are bound to * from Ada, there are no external .h files even though they must be public. */ +void ada_test_begin(void); +void ada_test_end(void); uint32_t milliseconds_per_tick(void); uint32_t ticks_per_second(void); uint32_t work_space_size(void); @@ -41,8 +43,22 @@ rtems_id tcb_to_id(Thread_Control *tcb); #define CONFIGURE_GNAT_RTEMS #define CONFIGURE_MEMORY_OVERHEAD (256) +#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION + #include <config.h> +const char rtems_test_name[] = ADA_TEST_NAME; + +void ada_test_begin(void) +{ + rtems_test_begin(rtems_test_name, RTEMS_TEST_STATE_PASS); +} + +void ada_test_end(void) +{ + rtems_test_end(rtems_test_name); +} + rtems_id tcb_to_id( Thread_Control *tcb ) diff --git a/testsuites/ada/support/test_support.ads b/testsuites/ada/support/test_support.ads index e41bf834ed..b1f2f55280 100644 --- a/testsuites/ada/support/test_support.ads +++ b/testsuites/ada/support/test_support.ads @@ -22,6 +22,12 @@ with RTEMS; package Test_Support is + procedure Ada_Test_Begin; + pragma Import (C, Ada_Test_Begin, "ada_test_begin"); + + procedure Ada_Test_End; + pragma Import (C, Ada_Test_End, "ada_test_end"); + -- -- Fatal_Directive_Status -- diff --git a/testsuites/ada/tmtests/tm01/config.h b/testsuites/ada/tmtests/tm01/config.h index fac8bedb98..b2a057674a 100644 --- a/testsuites/ada/tmtests/tm01/config.h +++ b/testsuites/ada/tmtests/tm01/config.h @@ -19,6 +19,8 @@ #define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 2 + +#define ADA_TEST_NAME "ADA TM 1" #define CONFIGURE_MAXIMUM_SEMAPHORES 1 #define CONFIGURE_TICKS_PER_TIMESLICE 0 diff --git a/testsuites/ada/tmtests/tm01/tmtest.adb b/testsuites/ada/tmtests/tm01/tmtest.adb index 31e54aa40f..4f48668cf0 100644 --- a/testsuites/ada/tmtests/tm01/tmtest.adb +++ b/testsuites/ada/tmtests/tm01/tmtest.adb @@ -40,7 +40,7 @@ package body TMTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** TIME TEST 1 ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; TMTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME( 'T', 'A', '1', ' ' ); TMTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME( 'T', 'A', '2', ' ' ); @@ -265,7 +265,7 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.SEMAPHORE_RELEASE ); - TEXT_IO.PUT_LINE( "*** END OF TIME TEST 1 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end TASK_1; diff --git a/testsuites/ada/tmtests/tm02/config.h b/testsuites/ada/tmtests/tm02/config.h index ffb8dc3723..18a1ad722a 100644 --- a/testsuites/ada/tmtests/tm02/config.h +++ b/testsuites/ada/tmtests/tm02/config.h @@ -19,6 +19,8 @@ #define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 111 + +#define ADA_TEST_NAME "ADA TM 2" #define CONFIGURE_MAXIMUM_TIMERS 110 #define CONFIGURE_MAXIMUM_SEMAPHORES 101 #define CONFIGURE_TICKS_PER_TIMESLICE 0 diff --git a/testsuites/ada/tmtests/tm02/tmtest.adb b/testsuites/ada/tmtests/tm02/tmtest.adb index 8fc9df5b18..c2386a5f51 100644 --- a/testsuites/ada/tmtests/tm02/tmtest.adb +++ b/testsuites/ada/tmtests/tm02/tmtest.adb @@ -40,7 +40,7 @@ package body TMTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** TIME TEST 2 ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; TMTEST.TEST_INIT; @@ -198,7 +198,7 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.SEMAPHORE_OBTAIN ); - TEXT_IO.PUT_LINE( "*** END OF TIME TEST 2 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end LOW_TASK; diff --git a/testsuites/ada/tmtests/tm03/config.h b/testsuites/ada/tmtests/tm03/config.h index ffb8dc3723..61daeb963e 100644 --- a/testsuites/ada/tmtests/tm03/config.h +++ b/testsuites/ada/tmtests/tm03/config.h @@ -19,6 +19,8 @@ #define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 111 + +#define ADA_TEST_NAME "ADA TM 3" #define CONFIGURE_MAXIMUM_TIMERS 110 #define CONFIGURE_MAXIMUM_SEMAPHORES 101 #define CONFIGURE_TICKS_PER_TIMESLICE 0 diff --git a/testsuites/ada/tmtests/tm03/tmtest.adb b/testsuites/ada/tmtests/tm03/tmtest.adb index a6e7606920..577b5fd121 100644 --- a/testsuites/ada/tmtests/tm03/tmtest.adb +++ b/testsuites/ada/tmtests/tm03/tmtest.adb @@ -41,7 +41,7 @@ package body TMTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** TIME TEST 3 ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'T', 'A', '1', ' ' ), @@ -182,7 +182,7 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.SEMAPHORE_RELEASE ); - TEXT_IO.PUT_LINE( "*** END OF TIME TEST 3 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end HIGH_TASK; diff --git a/testsuites/ada/tmtests/tm04/config.h b/testsuites/ada/tmtests/tm04/config.h index 0a37e7f8e6..42f8aeeef0 100644 --- a/testsuites/ada/tmtests/tm04/config.h +++ b/testsuites/ada/tmtests/tm04/config.h @@ -19,6 +19,8 @@ #define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 111 + +#define ADA_TEST_NAME "ADA TM 4" #define CONFIGURE_MAXIMUM_SEMAPHORES 1 #define CONFIGURE_TICKS_PER_TIMESLICE 0 diff --git a/testsuites/ada/tmtests/tm04/tmtest.adb b/testsuites/ada/tmtests/tm04/tmtest.adb index 7278bf2432..581a15a857 100644 --- a/testsuites/ada/tmtests/tm04/tmtest.adb +++ b/testsuites/ada/tmtests/tm04/tmtest.adb @@ -39,7 +39,7 @@ package body TMTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** TIME TEST 4 ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; TMTEST.TEST_INIT; @@ -397,7 +397,7 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.TASK_DELETE ); - TEXT_IO.PUT_LINE( "*** END OF TIME TEST 4 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end HIGH_TASK; diff --git a/testsuites/ada/tmtests/tm05/config.h b/testsuites/ada/tmtests/tm05/config.h index ffb8dc3723..7b56b81b99 100644 --- a/testsuites/ada/tmtests/tm05/config.h +++ b/testsuites/ada/tmtests/tm05/config.h @@ -19,6 +19,8 @@ #define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 111 + +#define ADA_TEST_NAME "ADA TM 5" #define CONFIGURE_MAXIMUM_TIMERS 110 #define CONFIGURE_MAXIMUM_SEMAPHORES 101 #define CONFIGURE_TICKS_PER_TIMESLICE 0 diff --git a/testsuites/ada/tmtests/tm05/tmtest.adb b/testsuites/ada/tmtests/tm05/tmtest.adb index c334acd526..46362e752a 100644 --- a/testsuites/ada/tmtests/tm05/tmtest.adb +++ b/testsuites/ada/tmtests/tm05/tmtest.adb @@ -38,7 +38,7 @@ package body TMTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** TIME TEST 5 ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; TMTEST.TEST_INIT; @@ -115,7 +115,7 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.TASK_RESUME ); - TEXT_IO.PUT_LINE( "*** END OF TIME TEST 5 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end HIGH_TASK; diff --git a/testsuites/ada/tmtests/tm06/config.h b/testsuites/ada/tmtests/tm06/config.h index ffb8dc3723..c8ae6d5751 100644 --- a/testsuites/ada/tmtests/tm06/config.h +++ b/testsuites/ada/tmtests/tm06/config.h @@ -19,6 +19,8 @@ #define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 111 + +#define ADA_TEST_NAME "ADA TM 6" #define CONFIGURE_MAXIMUM_TIMERS 110 #define CONFIGURE_MAXIMUM_SEMAPHORES 101 #define CONFIGURE_TICKS_PER_TIMESLICE 0 diff --git a/testsuites/ada/tmtests/tm06/tmtest.adb b/testsuites/ada/tmtests/tm06/tmtest.adb index 2f0f8b1a26..fc43355645 100644 --- a/testsuites/ada/tmtests/tm06/tmtest.adb +++ b/testsuites/ada/tmtests/tm06/tmtest.adb @@ -38,7 +38,7 @@ package body TMTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** TIME TEST 6 ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; TMTEST.TEST_INIT; @@ -180,7 +180,7 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.TASK_DELETE ); - TEXT_IO.PUT_LINE( "*** END OF TIME TEST 6 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end TASK_1; diff --git a/testsuites/ada/tmtests/tm07/config.h b/testsuites/ada/tmtests/tm07/config.h index ffb8dc3723..f6ca20e61f 100644 --- a/testsuites/ada/tmtests/tm07/config.h +++ b/testsuites/ada/tmtests/tm07/config.h @@ -19,6 +19,8 @@ #define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 111 + +#define ADA_TEST_NAME "ADA TM 7" #define CONFIGURE_MAXIMUM_TIMERS 110 #define CONFIGURE_MAXIMUM_SEMAPHORES 101 #define CONFIGURE_TICKS_PER_TIMESLICE 0 diff --git a/testsuites/ada/tmtests/tm07/tmtest.adb b/testsuites/ada/tmtests/tm07/tmtest.adb index c3a2c62b96..4f2f4abdbd 100644 --- a/testsuites/ada/tmtests/tm07/tmtest.adb +++ b/testsuites/ada/tmtests/tm07/tmtest.adb @@ -38,7 +38,7 @@ package body TMTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** TIME TEST 7 ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; TMTEST.TEST_INIT; @@ -114,7 +114,7 @@ package body TMTEST is RTEMS.TASKS.SUSPEND( RTEMS.SELF, STATUS ); end if; - TEXT_IO.PUT_LINE( "*** END OF TIME TEST 07 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end HIGH_TASK; diff --git a/testsuites/ada/tmtests/tm08/config.h b/testsuites/ada/tmtests/tm08/config.h index ffb8dc3723..1c6324f773 100644 --- a/testsuites/ada/tmtests/tm08/config.h +++ b/testsuites/ada/tmtests/tm08/config.h @@ -19,6 +19,8 @@ #define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 111 + +#define ADA_TEST_NAME "ADA TM 8" #define CONFIGURE_MAXIMUM_TIMERS 110 #define CONFIGURE_MAXIMUM_SEMAPHORES 101 #define CONFIGURE_TICKS_PER_TIMESLICE 0 diff --git a/testsuites/ada/tmtests/tm08/tmtest.adb b/testsuites/ada/tmtests/tm08/tmtest.adb index c1dbcb3e30..9f14c9383a 100644 --- a/testsuites/ada/tmtests/tm08/tmtest.adb +++ b/testsuites/ada/tmtests/tm08/tmtest.adb @@ -40,7 +40,7 @@ package body TMTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** TIME TEST 8 ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; TMTEST.TEST_INIT; @@ -266,7 +266,7 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.CLOCK_GET ); - TEXT_IO.PUT_LINE( "*** END OF TIME TEST 8 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end TEST_TASK; diff --git a/testsuites/ada/tmtests/tm09/config.h b/testsuites/ada/tmtests/tm09/config.h index 5b40e5c8da..c14f17c385 100644 --- a/testsuites/ada/tmtests/tm09/config.h +++ b/testsuites/ada/tmtests/tm09/config.h @@ -19,6 +19,8 @@ #define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 2 + +#define ADA_TEST_NAME "ADA TM 9" #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1 #define CONFIGURE_TICKS_PER_TIMESLICE 0 diff --git a/testsuites/ada/tmtests/tm09/tmtest.adb b/testsuites/ada/tmtests/tm09/tmtest.adb index 432a7b50a8..ee54c199d2 100644 --- a/testsuites/ada/tmtests/tm09/tmtest.adb +++ b/testsuites/ada/tmtests/tm09/tmtest.adb @@ -41,7 +41,7 @@ package body TMTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** TIME TEST 9 ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; RTEMS.TASKS.CREATE( 1, @@ -108,7 +108,7 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.MESSAGE_QUEUE_DELETE ); - TEXT_IO.PUT_LINE( "*** END OF TIME TEST 9 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end TEST_TASK; diff --git a/testsuites/ada/tmtests/tm10/config.h b/testsuites/ada/tmtests/tm10/config.h index 7d4d661a2e..fd96463749 100644 --- a/testsuites/ada/tmtests/tm10/config.h +++ b/testsuites/ada/tmtests/tm10/config.h @@ -19,6 +19,8 @@ #define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 110 + +#define ADA_TEST_NAME "ADA TM 10" #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1 #define CONFIGURE_TICKS_PER_TIMESLICE 0 diff --git a/testsuites/ada/tmtests/tm10/tmtest.adb b/testsuites/ada/tmtests/tm10/tmtest.adb index 9a92266cf5..23e2513541 100644 --- a/testsuites/ada/tmtests/tm10/tmtest.adb +++ b/testsuites/ada/tmtests/tm10/tmtest.adb @@ -40,7 +40,7 @@ package body TMTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** TIME TEST 10 ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; TMTEST.TEST_INIT; @@ -212,7 +212,7 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.MESSAGE_QUEUE_RECEIVE ); - TEXT_IO.PUT_LINE( "*** END OF TIME TEST 10 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end LOW_TASK; diff --git a/testsuites/ada/tmtests/tm11/config.h b/testsuites/ada/tmtests/tm11/config.h index f5412f0119..e4ed6d1c83 100644 --- a/testsuites/ada/tmtests/tm11/config.h +++ b/testsuites/ada/tmtests/tm11/config.h @@ -19,6 +19,8 @@ #define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 111 + +#define ADA_TEST_NAME "ADA TM 11" #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1 #define CONFIGURE_TICKS_PER_TIMESLICE 0 diff --git a/testsuites/ada/tmtests/tm11/tmtest.adb b/testsuites/ada/tmtests/tm11/tmtest.adb index 610c248d57..b454462e2f 100644 --- a/testsuites/ada/tmtests/tm11/tmtest.adb +++ b/testsuites/ada/tmtests/tm11/tmtest.adb @@ -41,7 +41,7 @@ package body TMTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** TIME TEST 11 ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; RTEMS.TASKS.CREATE( 1, @@ -174,7 +174,7 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.MESSAGE_QUEUE_SEND ); - TEXT_IO.PUT_LINE( "*** END OF TIME TEST 11 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end HIGH_TASK; diff --git a/testsuites/ada/tmtests/tm12/config.h b/testsuites/ada/tmtests/tm12/config.h index f5412f0119..1d9df47b78 100644 --- a/testsuites/ada/tmtests/tm12/config.h +++ b/testsuites/ada/tmtests/tm12/config.h @@ -19,6 +19,8 @@ #define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 111 + +#define ADA_TEST_NAME "ADA TM 12" #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1 #define CONFIGURE_TICKS_PER_TIMESLICE 0 diff --git a/testsuites/ada/tmtests/tm12/tmtest.adb b/testsuites/ada/tmtests/tm12/tmtest.adb index a97330f7bf..11a4f6abc1 100644 --- a/testsuites/ada/tmtests/tm12/tmtest.adb +++ b/testsuites/ada/tmtests/tm12/tmtest.adb @@ -41,7 +41,7 @@ package body TMTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** TIME TEST 12 ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; RTEMS.TASKS.CREATE( 1, @@ -168,7 +168,7 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.MESSAGE_QUEUE_SEND ); - TEXT_IO.PUT_LINE( "*** END OF TIME TEST 12 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end HIGH_TASK; diff --git a/testsuites/ada/tmtests/tm13/config.h b/testsuites/ada/tmtests/tm13/config.h index f5412f0119..b05713dd8d 100644 --- a/testsuites/ada/tmtests/tm13/config.h +++ b/testsuites/ada/tmtests/tm13/config.h @@ -19,6 +19,8 @@ #define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 111 + +#define ADA_TEST_NAME "ADA TM 13" #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1 #define CONFIGURE_TICKS_PER_TIMESLICE 0 diff --git a/testsuites/ada/tmtests/tm13/tmtest.adb b/testsuites/ada/tmtests/tm13/tmtest.adb index aa9a760f82..6bb8d3fb01 100644 --- a/testsuites/ada/tmtests/tm13/tmtest.adb +++ b/testsuites/ada/tmtests/tm13/tmtest.adb @@ -41,7 +41,7 @@ package body TMTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** TIME TEST 13 ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; RTEMS.TASKS.CREATE( 1, @@ -172,7 +172,7 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.MESSAGE_QUEUE_URGENT ); - TEXT_IO.PUT_LINE( "*** END OF TIME TEST 13 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end HIGH_TASK; diff --git a/testsuites/ada/tmtests/tm14/config.h b/testsuites/ada/tmtests/tm14/config.h index f5412f0119..ee8a005be0 100644 --- a/testsuites/ada/tmtests/tm14/config.h +++ b/testsuites/ada/tmtests/tm14/config.h @@ -19,6 +19,8 @@ #define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 111 + +#define ADA_TEST_NAME "ADA TM 14" #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1 #define CONFIGURE_TICKS_PER_TIMESLICE 0 diff --git a/testsuites/ada/tmtests/tm14/tmtest.adb b/testsuites/ada/tmtests/tm14/tmtest.adb index adde5deb77..b2f676e189 100644 --- a/testsuites/ada/tmtests/tm14/tmtest.adb +++ b/testsuites/ada/tmtests/tm14/tmtest.adb @@ -41,7 +41,7 @@ package body TMTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** TIME TEST 14 ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; RTEMS.TASKS.CREATE( 1, @@ -179,7 +179,7 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.MESSAGE_QUEUE_URGENT ); - TEXT_IO.PUT_LINE( "*** END OF TIME TEST 14 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end HIGH_TASK; diff --git a/testsuites/ada/tmtests/tm15/config.h b/testsuites/ada/tmtests/tm15/config.h index f5412f0119..1753ca083c 100644 --- a/testsuites/ada/tmtests/tm15/config.h +++ b/testsuites/ada/tmtests/tm15/config.h @@ -19,6 +19,8 @@ #define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 111 + +#define ADA_TEST_NAME "ADA TM 15" #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1 #define CONFIGURE_TICKS_PER_TIMESLICE 0 diff --git a/testsuites/ada/tmtests/tm15/tmtest.adb b/testsuites/ada/tmtests/tm15/tmtest.adb index 2a7efedcf9..33ff7df2f0 100644 --- a/testsuites/ada/tmtests/tm15/tmtest.adb +++ b/testsuites/ada/tmtests/tm15/tmtest.adb @@ -38,7 +38,7 @@ package body TMTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** TIME TEST 15 ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; TMTEST.TEST_INIT; @@ -232,7 +232,7 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.EVENT_SEND ); - TEXT_IO.PUT_LINE( "*** END OF TIME TEST 15 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end LOW_TASK; diff --git a/testsuites/ada/tmtests/tm16/config.h b/testsuites/ada/tmtests/tm16/config.h index f5412f0119..324be4e677 100644 --- a/testsuites/ada/tmtests/tm16/config.h +++ b/testsuites/ada/tmtests/tm16/config.h @@ -19,6 +19,8 @@ #define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 111 + +#define ADA_TEST_NAME "ADA TM 16" #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1 #define CONFIGURE_TICKS_PER_TIMESLICE 0 diff --git a/testsuites/ada/tmtests/tm16/tmtest.adb b/testsuites/ada/tmtests/tm16/tmtest.adb index 4be7a6bbd6..982adc8684 100644 --- a/testsuites/ada/tmtests/tm16/tmtest.adb +++ b/testsuites/ada/tmtests/tm16/tmtest.adb @@ -40,7 +40,7 @@ package body TMTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** TIME TEST 16 ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'T', 'E', 'S', 'T' ), @@ -188,7 +188,7 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.EVENT_SEND ); - TEXT_IO.PUT_LINE( "*** END OF TIME TEST 16 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end HIGH_TASK; diff --git a/testsuites/ada/tmtests/tm17/config.h b/testsuites/ada/tmtests/tm17/config.h index f5412f0119..9eb0d0f1a6 100644 --- a/testsuites/ada/tmtests/tm17/config.h +++ b/testsuites/ada/tmtests/tm17/config.h @@ -19,6 +19,8 @@ #define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 111 + +#define ADA_TEST_NAME "ADA TM 17" #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1 #define CONFIGURE_TICKS_PER_TIMESLICE 0 diff --git a/testsuites/ada/tmtests/tm17/tmtest.adb b/testsuites/ada/tmtests/tm17/tmtest.adb index 5e645581d4..1e093c839e 100644 --- a/testsuites/ada/tmtests/tm17/tmtest.adb +++ b/testsuites/ada/tmtests/tm17/tmtest.adb @@ -39,7 +39,7 @@ package body TMTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** TIME TEST 17 ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; TMTEST.TASK_PRIORITY := 254; @@ -147,7 +147,7 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.TASK_SET_PRIORITY ); - TEXT_IO.PUT_LINE( "*** END OF TIME TEST 17 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end LAST_TASK; diff --git a/testsuites/ada/tmtests/tm18/config.h b/testsuites/ada/tmtests/tm18/config.h index f5412f0119..cebc0653d9 100644 --- a/testsuites/ada/tmtests/tm18/config.h +++ b/testsuites/ada/tmtests/tm18/config.h @@ -19,6 +19,8 @@ #define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 111 + +#define ADA_TEST_NAME "ADA TM 18" #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1 #define CONFIGURE_TICKS_PER_TIMESLICE 0 diff --git a/testsuites/ada/tmtests/tm18/tmtest.adb b/testsuites/ada/tmtests/tm18/tmtest.adb index e86b24cd4a..25c4594318 100644 --- a/testsuites/ada/tmtests/tm18/tmtest.adb +++ b/testsuites/ada/tmtests/tm18/tmtest.adb @@ -39,7 +39,7 @@ package body TMTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** TIME TEST 18 ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; TMTEST.TEST_INIT; @@ -143,7 +143,7 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.TASK_DELETE ); - TEXT_IO.PUT_LINE( "*** END OF TIME TEST 18 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end LAST_TASK; diff --git a/testsuites/ada/tmtests/tm19/config.h b/testsuites/ada/tmtests/tm19/config.h index f5412f0119..b41632e8a2 100644 --- a/testsuites/ada/tmtests/tm19/config.h +++ b/testsuites/ada/tmtests/tm19/config.h @@ -19,6 +19,8 @@ #define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 111 + +#define ADA_TEST_NAME "ADA TM 19" #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1 #define CONFIGURE_TICKS_PER_TIMESLICE 0 diff --git a/testsuites/ada/tmtests/tm19/tmtest.adb b/testsuites/ada/tmtests/tm19/tmtest.adb index 288a6a799d..df05cb42ed 100644 --- a/testsuites/ada/tmtests/tm19/tmtest.adb +++ b/testsuites/ada/tmtests/tm19/tmtest.adb @@ -39,7 +39,7 @@ package body TMTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** TIME TEST 19 ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' ), @@ -279,7 +279,7 @@ package body TMTEST is 0 ); - TEXT_IO.PUT_LINE( "*** END OF TIME TEST 19 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end TASK_3; diff --git a/testsuites/ada/tmtests/tm20/config.h b/testsuites/ada/tmtests/tm20/config.h index 5ba47ff16a..2085f4ea0b 100644 --- a/testsuites/ada/tmtests/tm20/config.h +++ b/testsuites/ada/tmtests/tm20/config.h @@ -21,6 +21,8 @@ #define CONFIGURE_MAXIMUM_PARTITIONS 1 #define CONFIGURE_MAXIMUM_REGIONS 1 #define CONFIGURE_MAXIMUM_TASKS 3 + +#define ADA_TEST_NAME "ADA TM 20" #define CONFIGURE_TICKS_PER_TIMESLICE 0 #define CONFIGURE_POSIX_INIT_THREAD_TABLE diff --git a/testsuites/ada/tmtests/tm20/tmtest.adb b/testsuites/ada/tmtests/tm20/tmtest.adb index 4a997f3ff4..d17e660d72 100644 --- a/testsuites/ada/tmtests/tm20/tmtest.adb +++ b/testsuites/ada/tmtests/tm20/tmtest.adb @@ -40,7 +40,7 @@ package body TMTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** TIME TEST 20 ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'T', 'I', 'M', '1' ), @@ -394,7 +394,7 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.REGION_DELETE ); - TEXT_IO.PUT_LINE( "*** END OF TIME TEST 20 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end TASK_1; diff --git a/testsuites/ada/tmtests/tm21/config.h b/testsuites/ada/tmtests/tm21/config.h index 92e63bd2e9..1398cd6a86 100644 --- a/testsuites/ada/tmtests/tm21/config.h +++ b/testsuites/ada/tmtests/tm21/config.h @@ -19,6 +19,8 @@ #define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 102 + +#define ADA_TEST_NAME "ADA TM 21" #define CONFIGURE_MAXIMUM_TIMERS 100 #define CONFIGURE_MAXIMUM_SEMAPHORES 100 #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 100 diff --git a/testsuites/ada/tmtests/tm21/tmtest.adb b/testsuites/ada/tmtests/tm21/tmtest.adb index 245376953d..9cf2d09e86 100644 --- a/testsuites/ada/tmtests/tm21/tmtest.adb +++ b/testsuites/ada/tmtests/tm21/tmtest.adb @@ -46,7 +46,7 @@ package body TMTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** TIME TEST 21 ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' ), @@ -296,7 +296,7 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.RATE_MONOTONIC_IDENT ); - TEXT_IO.PUT_LINE( "*** END OF TIME TEST 21 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end TASK_1; diff --git a/testsuites/ada/tmtests/tm22/config.h b/testsuites/ada/tmtests/tm22/config.h index 2bceeec20d..7da538839e 100644 --- a/testsuites/ada/tmtests/tm22/config.h +++ b/testsuites/ada/tmtests/tm22/config.h @@ -19,6 +19,8 @@ #define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 103 + +#define ADA_TEST_NAME "ADA TM 22" #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1 #define CONFIGURE_TICKS_PER_TIMESLICE 0 diff --git a/testsuites/ada/tmtests/tm22/tmtest.adb b/testsuites/ada/tmtests/tm22/tmtest.adb index ea1afc84c9..0ef326b97d 100644 --- a/testsuites/ada/tmtests/tm22/tmtest.adb +++ b/testsuites/ada/tmtests/tm22/tmtest.adb @@ -40,7 +40,7 @@ package body TMTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** TIME TEST 22 ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; RTEMS.MESSAGE_QUEUE.CREATE( RTEMS.BUILD_NAME( 'M', 'Q', '1', ' ' ), @@ -215,7 +215,7 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.MESSAGE_QUEUE_BROADCAST ); - TEXT_IO.PUT_LINE( "*** END OF TIME TEST 22 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end LOW_TASK; diff --git a/testsuites/ada/tmtests/tm23/config.h b/testsuites/ada/tmtests/tm23/config.h index 1873730f52..98fcf60487 100644 --- a/testsuites/ada/tmtests/tm23/config.h +++ b/testsuites/ada/tmtests/tm23/config.h @@ -19,6 +19,8 @@ #define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 111 + +#define ADA_TEST_NAME "ADA TM 23" #define CONFIGURE_MAXIMUM_TIMERS 110 #define CONFIGURE_TICKS_PER_TIMESLICE 0 diff --git a/testsuites/ada/tmtests/tm23/tmtest.adb b/testsuites/ada/tmtests/tm23/tmtest.adb index 4b5a26f777..6115416f1b 100644 --- a/testsuites/ada/tmtests/tm23/tmtest.adb +++ b/testsuites/ada/tmtests/tm23/tmtest.adb @@ -43,7 +43,7 @@ package body TMTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** TIME TEST 23 ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; TASK_PRIORITY := 5; @@ -380,7 +380,7 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.TASK_WAKE_WHEN ); - TEXT_IO.PUT_LINE( "*** END OF TIME TEST 23 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end LOW_TASK; diff --git a/testsuites/ada/tmtests/tm24/config.h b/testsuites/ada/tmtests/tm24/config.h index 0e9cbf456d..207ac7eed3 100644 --- a/testsuites/ada/tmtests/tm24/config.h +++ b/testsuites/ada/tmtests/tm24/config.h @@ -19,6 +19,8 @@ #define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 111 + +#define ADA_TEST_NAME "ADA TM 24" #define CONFIGURE_TICKS_PER_TIMESLICE 0 #define CONFIGURE_POSIX_INIT_THREAD_TABLE diff --git a/testsuites/ada/tmtests/tm24/tmtest.adb b/testsuites/ada/tmtests/tm24/tmtest.adb index 2bcd220516..b5830cef7b 100644 --- a/testsuites/ada/tmtests/tm24/tmtest.adb +++ b/testsuites/ada/tmtests/tm24/tmtest.adb @@ -40,7 +40,7 @@ package body TMTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** TIME TEST 24 ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; TIMER_DRIVER.INITIALIZE; for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT @@ -148,7 +148,7 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.TASK_WAKE_AFTER ); - TEXT_IO.PUT_LINE( "*** END OF TIME TEST 24 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end if; diff --git a/testsuites/ada/tmtests/tm25/config.h b/testsuites/ada/tmtests/tm25/config.h index 0a37e7f8e6..79b6724665 100644 --- a/testsuites/ada/tmtests/tm25/config.h +++ b/testsuites/ada/tmtests/tm25/config.h @@ -19,6 +19,8 @@ #define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 111 + +#define ADA_TEST_NAME "ADA TM 25" #define CONFIGURE_MAXIMUM_SEMAPHORES 1 #define CONFIGURE_TICKS_PER_TIMESLICE 0 diff --git a/testsuites/ada/tmtests/tm25/tmtest.adb b/testsuites/ada/tmtests/tm25/tmtest.adb index 8710052bfb..63d68d4aa1 100644 --- a/testsuites/ada/tmtests/tm25/tmtest.adb +++ b/testsuites/ada/tmtests/tm25/tmtest.adb @@ -41,7 +41,7 @@ package body TMTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** TIME TEST 25 ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; RTEMS.SEMAPHORE.CREATE( RTEMS.BUILD_NAME( 'S', 'M', '1', ' ' ), @@ -147,7 +147,7 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.CLOCK_TICK ); - TEXT_IO.PUT_LINE( "*** END OF TIME TEST 25 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end LOW_TASK; diff --git a/testsuites/ada/tmtests/tm28/config.h b/testsuites/ada/tmtests/tm28/config.h index d050077d01..aca19475c3 100644 --- a/testsuites/ada/tmtests/tm28/config.h +++ b/testsuites/ada/tmtests/tm28/config.h @@ -19,6 +19,8 @@ #define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 2 + +#define ADA_TEST_NAME "ADA TM 28" #define CONFIGURE_MAXIMUM_PORTS 1 #define CONFIGURE_TICKS_PER_TIMESLICE 0 diff --git a/testsuites/ada/tmtests/tm28/tmtest.adb b/testsuites/ada/tmtests/tm28/tmtest.adb index 189090e39f..71b6edc32f 100644 --- a/testsuites/ada/tmtests/tm28/tmtest.adb +++ b/testsuites/ada/tmtests/tm28/tmtest.adb @@ -38,7 +38,7 @@ package body TMTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** TIME TEST 28 ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'T', 'E', 'S', 'T' ), @@ -163,7 +163,7 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.PORT_DELETE ); - TEXT_IO.PUT_LINE( "*** END OF TIME TEST 28 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end TEST_TASK; diff --git a/testsuites/ada/tmtests/tm29/config.h b/testsuites/ada/tmtests/tm29/config.h index 85aa0d9efa..fd99933160 100644 --- a/testsuites/ada/tmtests/tm29/config.h +++ b/testsuites/ada/tmtests/tm29/config.h @@ -19,6 +19,8 @@ #define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 111 + +#define ADA_TEST_NAME "ADA TM 29" #define CONFIGURE_MAXIMUM_PERIODS 111 #define CONFIGURE_TICKS_PER_TIMESLICE 0 diff --git a/testsuites/ada/tmtests/tm29/tmtest.adb b/testsuites/ada/tmtests/tm29/tmtest.adb index 0a6a31b713..c77fbc0abd 100644 --- a/testsuites/ada/tmtests/tm29/tmtest.adb +++ b/testsuites/ada/tmtests/tm29/tmtest.adb @@ -41,7 +41,7 @@ package body TMTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** TIME TEST 29 ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; TMTEST.PERIOD_NAME := RTEMS.BUILD_NAME( 'P', 'R', 'D', ' ' ); @@ -228,7 +228,7 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.RATE_MONOTONIC_PERIOD ); - TEXT_IO.PUT_LINE( "*** END OF TIME TEST 29 ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end LOW_TASK; diff --git a/testsuites/ada/tmtests/tmck/config.h b/testsuites/ada/tmtests/tmck/config.h index fac8bedb98..40b56220a9 100644 --- a/testsuites/ada/tmtests/tmck/config.h +++ b/testsuites/ada/tmtests/tmck/config.h @@ -19,6 +19,8 @@ #define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 2 + +#define ADA_TEST_NAME "ADA TMCK" #define CONFIGURE_MAXIMUM_SEMAPHORES 1 #define CONFIGURE_TICKS_PER_TIMESLICE 0 diff --git a/testsuites/ada/tmtests/tmck/tmtest.adb b/testsuites/ada/tmtests/tmck/tmtest.adb index 8da1ff220a..d1d7659988 100644 --- a/testsuites/ada/tmtests/tmck/tmtest.adb +++ b/testsuites/ada/tmtests/tmck/tmtest.adb @@ -39,7 +39,7 @@ package body TMTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** TIME TEST CHECK ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; TIMER_DRIVER.SET_FIND_AVERAGE_OVERHEAD( TRUE ); @@ -149,7 +149,7 @@ TEST_SUPPORT.PAUSE; 0 ); - TEXT_IO.PUT_LINE( "*** END OF TIME TEST CHECK ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end TASK_1; diff --git a/testsuites/ada/tmtests/tmoverhd/config.h b/testsuites/ada/tmtests/tmoverhd/config.h index fac8bedb98..df551c90fe 100644 --- a/testsuites/ada/tmtests/tmoverhd/config.h +++ b/testsuites/ada/tmtests/tmoverhd/config.h @@ -19,6 +19,8 @@ #define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 2 + +#define ADA_TEST_NAME "ADA TMOVERHD" #define CONFIGURE_MAXIMUM_SEMAPHORES 1 #define CONFIGURE_TICKS_PER_TIMESLICE 0 diff --git a/testsuites/ada/tmtests/tmoverhd/tmtest.adb b/testsuites/ada/tmtests/tmoverhd/tmtest.adb index 58c5ad09c6..d271ed220c 100644 --- a/testsuites/ada/tmtests/tmoverhd/tmtest.adb +++ b/testsuites/ada/tmtests/tmoverhd/tmtest.adb @@ -39,7 +39,7 @@ package body TMTEST is begin TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT_LINE( "*** TIME TEST OVERHEAD ***" ); + TEST_SUPPORT.ADA_TEST_BEGIN; TIMER_DRIVER.SET_FIND_AVERAGE_OVERHEAD( TRUE ); @@ -1355,7 +1355,7 @@ TEST_SUPPORT.PAUSE; 0 ); - TEXT_IO.PUT_LINE( "*** END OF TIME TEST OVERHEAD ***" ); + TEST_SUPPORT.ADA_TEST_END; RTEMS.SHUTDOWN_EXECUTIVE( 0 ); end TASK_1; |