From 51b3cbca11b940d37b791b4d8009c2144db31ac6 Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Thu, 4 Oct 2018 15:23:25 +0200
Subject: tests: Use rtems_task_exit()

Update #3533.
---
 testsuites/tmtests/tm01/task1.c        | 4 +---
 testsuites/tmtests/tm03/task1.c        | 3 +--
 testsuites/tmtests/tm04/task1.c        | 9 ++-------
 testsuites/tmtests/tm05/task1.c        | 3 +--
 testsuites/tmtests/tm06/task1.c        | 3 +--
 testsuites/tmtests/tm07/task1.c        | 3 +--
 testsuites/tmtests/tm08/task1.c        | 5 +----
 testsuites/tmtests/tm09/task1.c        | 3 +--
 testsuites/tmtests/tm10/task1.c        | 3 +--
 testsuites/tmtests/tm11/task1.c        | 3 +--
 testsuites/tmtests/tm12/task1.c        | 3 +--
 testsuites/tmtests/tm13/task1.c        | 3 +--
 testsuites/tmtests/tm14/task1.c        | 3 +--
 testsuites/tmtests/tm15/task1.c        | 5 +----
 testsuites/tmtests/tm16/task1.c        | 3 +--
 testsuites/tmtests/tm17/task1.c        | 3 +--
 testsuites/tmtests/tm18/task1.c        | 9 +++------
 testsuites/tmtests/tm19/task1.c        | 3 +--
 testsuites/tmtests/tm20/task1.c        | 8 ++------
 testsuites/tmtests/tm21/task1.c        | 3 +--
 testsuites/tmtests/tm22/task1.c        | 3 +--
 testsuites/tmtests/tm23/task1.c        | 3 +--
 testsuites/tmtests/tm24/task1.c        | 7 ++-----
 testsuites/tmtests/tm25/task1.c        | 3 +--
 testsuites/tmtests/tm26/task1.c        | 3 +--
 testsuites/tmtests/tm27/task1.c        | 3 +--
 testsuites/tmtests/tm28/task1.c        | 3 +--
 testsuites/tmtests/tm29/task1.c        | 3 +--
 testsuites/tmtests/tmck/task1.c        | 3 +--
 testsuites/tmtests/tmoverhd/testtask.c | 3 +--
 30 files changed, 35 insertions(+), 81 deletions(-)

(limited to 'testsuites/tmtests')

diff --git a/testsuites/tmtests/tm01/task1.c b/testsuites/tmtests/tm01/task1.c
index 3062eae9c4..c2549701bc 100644
--- a/testsuites/tmtests/tm01/task1.c
+++ b/testsuites/tmtests/tm01/task1.c
@@ -47,9 +47,7 @@ rtems_task Init(
   status = rtems_task_start( Task_id[ 1 ], Test_task, 0 );
   directive_failed( status, "rtems_task_start of TA1" );
 
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-
+  rtems_task_exit();
 }
 
 rtems_task Test_task(
diff --git a/testsuites/tmtests/tm03/task1.c b/testsuites/tmtests/tm03/task1.c
index f54e1f224a..63c21c2d45 100644
--- a/testsuites/tmtests/tm03/task1.c
+++ b/testsuites/tmtests/tm03/task1.c
@@ -77,8 +77,7 @@ rtems_task Init(
   status = rtems_task_start( task_id, test_init, 0 );
   directive_failed( status, "rtems_task_start of test_init" );
 
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
+  rtems_task_exit();
 }
 
 rtems_task test_init(
diff --git a/testsuites/tmtests/tm04/task1.c b/testsuites/tmtests/tm04/task1.c
index 40cca6cf6f..54ac8f2bf3 100644
--- a/testsuites/tmtests/tm04/task1.c
+++ b/testsuites/tmtests/tm04/task1.c
@@ -43,16 +43,13 @@ rtems_task Init(
   rtems_task_argument argument
 )
 {
-  rtems_status_code status;
-
   Print_Warning();
 
   TEST_BEGIN();
 
   test_init();
 
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
+  rtems_task_exit();
 }
 
 void test_init(void)
@@ -126,9 +123,7 @@ rtems_task Highest_task(
       0
     );
 
-    status = rtems_task_delete( RTEMS_SELF );
-    directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-
+    rtems_task_exit();
   } else
     (void) rtems_semaphore_obtain(
       Semaphore_id,
diff --git a/testsuites/tmtests/tm05/task1.c b/testsuites/tmtests/tm05/task1.c
index e23d03bdc1..0c23d37ec1 100644
--- a/testsuites/tmtests/tm05/task1.c
+++ b/testsuites/tmtests/tm05/task1.c
@@ -47,8 +47,7 @@ rtems_task Init(
 
   test_init();
 
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
+  rtems_task_exit();
 }
 
 void test_init(void)
diff --git a/testsuites/tmtests/tm06/task1.c b/testsuites/tmtests/tm06/task1.c
index f419c997d9..af1579e227 100644
--- a/testsuites/tmtests/tm06/task1.c
+++ b/testsuites/tmtests/tm06/task1.c
@@ -42,8 +42,7 @@ rtems_task Init(
 
   test_init();
 
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
+  rtems_task_exit();
 }
 
 void test_init( void )
diff --git a/testsuites/tmtests/tm07/task1.c b/testsuites/tmtests/tm07/task1.c
index eca64dbc0c..a66aab533f 100644
--- a/testsuites/tmtests/tm07/task1.c
+++ b/testsuites/tmtests/tm07/task1.c
@@ -46,8 +46,7 @@ rtems_task Init(
 
   test_init();
 
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
+  rtems_task_exit();
 }
 
 void test_init(void)
diff --git a/testsuites/tmtests/tm08/task1.c b/testsuites/tmtests/tm08/task1.c
index 389a0642de..ad38a54c76 100644
--- a/testsuites/tmtests/tm08/task1.c
+++ b/testsuites/tmtests/tm08/task1.c
@@ -30,16 +30,13 @@ rtems_task Init(
   rtems_task_argument argument
 )
 {
-  rtems_status_code status;
-
   Print_Warning();
 
   TEST_BEGIN();
 
   test_init();
 
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
+  rtems_task_exit();
 }
 
 void test_init(void)
diff --git a/testsuites/tmtests/tm09/task1.c b/testsuites/tmtests/tm09/task1.c
index ff28ca2398..9caf4d9d14 100644
--- a/testsuites/tmtests/tm09/task1.c
+++ b/testsuites/tmtests/tm09/task1.c
@@ -46,8 +46,7 @@ rtems_task Init(
   status = rtems_task_start( Task_id[ 1 ], Test_task, 0 );
   directive_failed( status, "rtems_task_start" );
 
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
+  rtems_task_exit();
 }
 
 rtems_task Test_task (
diff --git a/testsuites/tmtests/tm10/task1.c b/testsuites/tmtests/tm10/task1.c
index 884af48ff2..c0a1e4f939 100644
--- a/testsuites/tmtests/tm10/task1.c
+++ b/testsuites/tmtests/tm10/task1.c
@@ -47,8 +47,7 @@ rtems_task Init(
 
   test_init();
 
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
+  rtems_task_exit();
 }
 
 void test_init()
diff --git a/testsuites/tmtests/tm11/task1.c b/testsuites/tmtests/tm11/task1.c
index e6061cea46..a83cf48386 100644
--- a/testsuites/tmtests/tm11/task1.c
+++ b/testsuites/tmtests/tm11/task1.c
@@ -58,8 +58,7 @@ void Init(
   status = rtems_task_start( id, test_init, 0 );
   directive_failed( status, "rtems_task_start" );
 
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
+  rtems_task_exit();
 }
 
 #define MESSAGE_SIZE (sizeof(long) * 4)
diff --git a/testsuites/tmtests/tm12/task1.c b/testsuites/tmtests/tm12/task1.c
index 1e6064ff11..1c13de8fc5 100644
--- a/testsuites/tmtests/tm12/task1.c
+++ b/testsuites/tmtests/tm12/task1.c
@@ -60,8 +60,7 @@ rtems_task Init(
   status = rtems_task_start( task_id, test_init, 0 );
   directive_failed( status, "rtems_task_start" );
 
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
+  rtems_task_exit();
 }
 
 rtems_task test_init(
diff --git a/testsuites/tmtests/tm13/task1.c b/testsuites/tmtests/tm13/task1.c
index 884723a5ab..d61852c404 100644
--- a/testsuites/tmtests/tm13/task1.c
+++ b/testsuites/tmtests/tm13/task1.c
@@ -60,8 +60,7 @@ void Init(
   status = rtems_task_start( id, test_init, 0 );
   directive_failed( status, "rtems_task_start" );
 
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
+  rtems_task_exit();
 }
 
 rtems_task test_init(
diff --git a/testsuites/tmtests/tm14/task1.c b/testsuites/tmtests/tm14/task1.c
index 74de9d4af9..4b94c579c3 100644
--- a/testsuites/tmtests/tm14/task1.c
+++ b/testsuites/tmtests/tm14/task1.c
@@ -60,8 +60,7 @@ rtems_task Init(
   status = rtems_task_start( task_id, test_init, 0 );
   directive_failed( status, "rtems_task_start" );
 
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
+  rtems_task_exit();
 }
 
 rtems_task test_init(
diff --git a/testsuites/tmtests/tm15/task1.c b/testsuites/tmtests/tm15/task1.c
index 6f7ecd5317..65b42d22fd 100644
--- a/testsuites/tmtests/tm15/task1.c
+++ b/testsuites/tmtests/tm15/task1.c
@@ -33,16 +33,13 @@ rtems_task Init(
   rtems_task_argument argument
 )
 {
-  rtems_status_code status;
-
   Print_Warning();
 
   TEST_BEGIN();
 
   test_init();
 
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
+  rtems_task_exit();
 }
 
 void test_init(void)
diff --git a/testsuites/tmtests/tm16/task1.c b/testsuites/tmtests/tm16/task1.c
index 5910a18f22..4cd6fabe72 100644
--- a/testsuites/tmtests/tm16/task1.c
+++ b/testsuites/tmtests/tm16/task1.c
@@ -56,8 +56,7 @@ rtems_task Init(
   status = rtems_task_start( id, test_init, 0 );
   directive_failed( status, "rtems_task_start of test_init" );
 
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
+  rtems_task_exit();
 }
 
 rtems_task test_init(
diff --git a/testsuites/tmtests/tm17/task1.c b/testsuites/tmtests/tm17/task1.c
index b58f8bd145..fb49796de6 100644
--- a/testsuites/tmtests/tm17/task1.c
+++ b/testsuites/tmtests/tm17/task1.c
@@ -69,8 +69,7 @@ rtems_task Init(
   }
 
   Task_count = 1;
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
+  rtems_task_exit();
 }
 
 rtems_task First_task(
diff --git a/testsuites/tmtests/tm18/task1.c b/testsuites/tmtests/tm18/task1.c
index 5db7c5da78..91df7bea81 100644
--- a/testsuites/tmtests/tm18/task1.c
+++ b/testsuites/tmtests/tm18/task1.c
@@ -38,16 +38,13 @@ rtems_task Init(
   rtems_task_argument argument
 )
 {
-  rtems_status_code status;
-
   Print_Warning();
 
   TEST_BEGIN();
 
   test_init();
 
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
+  rtems_task_exit();
 }
 
 void test_init(void)
@@ -85,14 +82,14 @@ rtems_task First_task(
 {
   benchmark_timer_initialize();
 
-  (void) rtems_task_delete( RTEMS_SELF );
+  rtems_task_exit();
 }
 
 rtems_task Middle_tasks(
   rtems_task_argument argument
 )
 {
-  (void) rtems_task_delete( RTEMS_SELF );
+  rtems_task_exit();
 }
 
 rtems_task Last_task(
diff --git a/testsuites/tmtests/tm19/task1.c b/testsuites/tmtests/tm19/task1.c
index 093dc21455..138cdef33c 100644
--- a/testsuites/tmtests/tm19/task1.c
+++ b/testsuites/tmtests/tm19/task1.c
@@ -85,8 +85,7 @@ rtems_task Init(
   status = rtems_task_start( Task_id[ 3 ], Task_3, 0 );
   directive_failed( status, "rtems_task_start of TASK3" );
 
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
+  rtems_task_exit();
 }
 
 rtems_asr Process_asr_for_pass_1(
diff --git a/testsuites/tmtests/tm20/task1.c b/testsuites/tmtests/tm20/task1.c
index cb6077d4c7..d84dbf4d29 100644
--- a/testsuites/tmtests/tm20/task1.c
+++ b/testsuites/tmtests/tm20/task1.c
@@ -84,8 +84,7 @@ rtems_task Init(
   status = rtems_task_start( Task_id[ 2 ], Task_2, 0 );
   directive_failed( status, "rtems_task_start of TASK2" );
 
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
+  rtems_task_exit();
 }
 
 rtems_task Task_1(
@@ -442,8 +441,6 @@ rtems_task Task_2(
   rtems_task_argument argument
 )
 {
-  rtems_status_code status;
-
   end_time = benchmark_timer_read();
 
   put_time(
@@ -471,6 +468,5 @@ rtems_task Task_2(
     0
   );
 
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
+  rtems_task_exit();
 }
diff --git a/testsuites/tmtests/tm21/task1.c b/testsuites/tmtests/tm21/task1.c
index 0b396c0841..0b96dddd90 100644
--- a/testsuites/tmtests/tm21/task1.c
+++ b/testsuites/tmtests/tm21/task1.c
@@ -47,8 +47,7 @@ rtems_task Init(
   status = rtems_task_start( id, Task_1, 0 );
   directive_failed( status, "rtems_task_start of TASK1" );
 
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
+  rtems_task_exit();
 }
 
 rtems_task Task_1(
diff --git a/testsuites/tmtests/tm22/task1.c b/testsuites/tmtests/tm22/task1.c
index 2757af4b8c..665eaaec70 100644
--- a/testsuites/tmtests/tm22/task1.c
+++ b/testsuites/tmtests/tm22/task1.c
@@ -79,8 +79,7 @@ rtems_task Init(
   status = rtems_task_start( id, Preempt_task, 0 );
   directive_failed( status, "rtems_task_start RTEMS_PREEMPT" );
 
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
+  rtems_task_exit();
 }
 
 rtems_task High_task(
diff --git a/testsuites/tmtests/tm23/task1.c b/testsuites/tmtests/tm23/task1.c
index c04f539960..f8a6f27991 100644
--- a/testsuites/tmtests/tm23/task1.c
+++ b/testsuites/tmtests/tm23/task1.c
@@ -84,8 +84,7 @@ rtems_task Init(
     priority++;
   }
 
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
+  rtems_task_exit();
 }
 
 void null_delay(
diff --git a/testsuites/tmtests/tm24/task1.c b/testsuites/tmtests/tm24/task1.c
index ac132ef40c..53a4d4e815 100644
--- a/testsuites/tmtests/tm24/task1.c
+++ b/testsuites/tmtests/tm24/task1.c
@@ -65,15 +65,13 @@ rtems_task Init(
     status = rtems_task_start( id, Tasks, 0 );
     directive_failed( status, "rtems_task_start LOOP" );
   }
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
+  rtems_task_exit();
 }
 
 rtems_task High_task(
   rtems_task_argument argument
 )
 {
-  rtems_status_code status;
   uint32_t    index;
 
   benchmark_timer_initialize();
@@ -96,8 +94,7 @@ rtems_task High_task(
 
   Task_count = 0;
 
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
+  rtems_task_exit();
 }
 
 rtems_task Tasks(
diff --git a/testsuites/tmtests/tm25/task1.c b/testsuites/tmtests/tm25/task1.c
index c8afe71b87..e5795ce120 100644
--- a/testsuites/tmtests/tm25/task1.c
+++ b/testsuites/tmtests/tm25/task1.c
@@ -75,8 +75,7 @@ rtems_task Init(
     directive_failed( status, "rtems_task_start LOOP" );
   }
 
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
+  rtems_task_exit();
 }
 
 rtems_task High_tasks(
diff --git a/testsuites/tmtests/tm26/task1.c b/testsuites/tmtests/tm26/task1.c
index 8145c58a13..483ddbe0d9 100644
--- a/testsuites/tmtests/tm26/task1.c
+++ b/testsuites/tmtests/tm26/task1.c
@@ -252,8 +252,7 @@ rtems_task Init(
     directive_failed( status, "rtems_task_start LOOP" );
   }
 
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
+  rtems_task_exit();
 }
 
 rtems_task High_task(
diff --git a/testsuites/tmtests/tm27/task1.c b/testsuites/tmtests/tm27/task1.c
index c89c0956f1..8c728dbe95 100644
--- a/testsuites/tmtests/tm27/task1.c
+++ b/testsuites/tmtests/tm27/task1.c
@@ -103,8 +103,7 @@ rtems_task Init(
   benchmark_timer_initialize();
   timer_overhead = benchmark_timer_read();
 
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
+  rtems_task_exit();
 }
 
 rtems_task Task_1(
diff --git a/testsuites/tmtests/tm28/task1.c b/testsuites/tmtests/tm28/task1.c
index 976cded38d..2e328beea0 100644
--- a/testsuites/tmtests/tm28/task1.c
+++ b/testsuites/tmtests/tm28/task1.c
@@ -48,8 +48,7 @@ rtems_task Init(
   status = rtems_task_start( Task_id[ 1 ], Test_task, 0 );
   directive_failed( status, "rtems_task_start" );
 
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
+  rtems_task_exit();
 }
 
 rtems_task Test_task (
diff --git a/testsuites/tmtests/tm29/task1.c b/testsuites/tmtests/tm29/task1.c
index e1c9aff969..648249e6a6 100644
--- a/testsuites/tmtests/tm29/task1.c
+++ b/testsuites/tmtests/tm29/task1.c
@@ -152,8 +152,7 @@ rtems_task Init(
 
   Task_count = 0;
 
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
+  rtems_task_exit();
 }
 
 rtems_task Tasks(
diff --git a/testsuites/tmtests/tmck/task1.c b/testsuites/tmtests/tmck/task1.c
index e13181f912..e6e9f78fab 100644
--- a/testsuites/tmtests/tmck/task1.c
+++ b/testsuites/tmtests/tmck/task1.c
@@ -62,8 +62,7 @@ rtems_task Init(
   status = rtems_task_start( id, Task_1, 0 );
   directive_failed( status, "rtems_task_start of TA1" );
 
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
+  rtems_task_exit();
 }
 
 rtems_task Task_1(
diff --git a/testsuites/tmtests/tmoverhd/testtask.c b/testsuites/tmtests/tmoverhd/testtask.c
index bc73f8bc5d..88f9f0bc32 100644
--- a/testsuites/tmtests/tmoverhd/testtask.c
+++ b/testsuites/tmtests/tmoverhd/testtask.c
@@ -49,8 +49,7 @@ rtems_task Init(
   status = rtems_task_start( id, Task_1, 0 );
   directive_failed( status, "rtems_task_start of TA1" );
 
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
+  rtems_task_exit();
 }
 
 /* comment out the following include to verify type are correct */
-- 
cgit v1.2.3