diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-10-04 15:23:25 +0200 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-10-05 13:41:07 +0200 |
commit | 51b3cbca11b940d37b791b4d8009c2144db31ac6 (patch) | |
tree | 603dd4aeee593f82d8224195f089ca3024c75f40 /testsuites/libtests | |
parent | score: Remove CPU_PROVIDES_IDLE_THREAD_BODY (diff) | |
download | rtems-51b3cbca11b940d37b791b4d8009c2144db31ac6.tar.bz2 |
tests: Use rtems_task_exit()
Update #3533.
Diffstat (limited to 'testsuites/libtests')
-rw-r--r-- | testsuites/libtests/block02/init.c | 2 | ||||
-rw-r--r-- | testsuites/libtests/block03/init.c | 2 | ||||
-rw-r--r-- | testsuites/libtests/block06/init.c | 6 | ||||
-rw-r--r-- | testsuites/libtests/block07/init.c | 6 | ||||
-rw-r--r-- | testsuites/libtests/block08/bdbuf_tests.h | 4 | ||||
-rw-r--r-- | testsuites/libtests/block10/init.c | 4 | ||||
-rw-r--r-- | testsuites/libtests/capture01/test1.c | 30 | ||||
-rw-r--r-- | testsuites/libtests/cpuuse/init.c | 2 | ||||
-rw-r--r-- | testsuites/libtests/exit01/init.c | 3 | ||||
-rw-r--r-- | testsuites/libtests/exit02/init.c | 3 | ||||
-rw-r--r-- | testsuites/libtests/malloctest/init.c | 3 | ||||
-rw-r--r-- | testsuites/libtests/monitor/init.c | 3 | ||||
-rw-r--r-- | testsuites/libtests/stackchk/init.c | 3 |
13 files changed, 33 insertions, 38 deletions
diff --git a/testsuites/libtests/block02/init.c b/testsuites/libtests/block02/init.c index 983f876bcd..d65df94f08 100644 --- a/testsuites/libtests/block02/init.c +++ b/testsuites/libtests/block02/init.c @@ -127,7 +127,7 @@ static void task_high(rtems_task_argument arg) printk("H: release done: B0\n"); - rtems_task_delete(RTEMS_SELF); + rtems_task_exit(); } static void do_ramdisk_register( diff --git a/testsuites/libtests/block03/init.c b/testsuites/libtests/block03/init.c index 2bab878134..55f2398db8 100644 --- a/testsuites/libtests/block03/init.c +++ b/testsuites/libtests/block03/init.c @@ -121,7 +121,7 @@ static void task_high(rtems_task_argument arg) printk("H: release done: 1\n"); - rtems_task_delete(RTEMS_SELF); + rtems_task_exit(); } static void do_ramdisk_register( diff --git a/testsuites/libtests/block06/init.c b/testsuites/libtests/block06/init.c index 7c6facf8d2..b134e5d3b6 100644 --- a/testsuites/libtests/block06/init.c +++ b/testsuites/libtests/block06/init.c @@ -1168,7 +1168,7 @@ bdbuf_tests_task_0 (rtems_task_argument arg) } printf ("%s: delete task\n", tc->name); - rtems_task_delete (RTEMS_SELF); + rtems_task_exit(); } /** @@ -1262,7 +1262,7 @@ bdbuf_tests_task_1 (rtems_task_argument arg) } printf ("%s: delete task\n", tc->name); - rtems_task_delete (RTEMS_SELF); + rtems_task_exit(); } /** @@ -1310,7 +1310,7 @@ bdbuf_tests_task_2 (rtems_task_argument arg) } printf ("%s: delete task\n", tc->name); - rtems_task_delete (RTEMS_SELF); + rtems_task_exit(); } /** diff --git a/testsuites/libtests/block07/init.c b/testsuites/libtests/block07/init.c index e0f7ecc031..05bfff99ba 100644 --- a/testsuites/libtests/block07/init.c +++ b/testsuites/libtests/block07/init.c @@ -127,7 +127,7 @@ static void task_mid(rtems_task_argument arg) printf("M: release done: 0\n"); - rtems_task_delete(RTEMS_SELF); + rtems_task_exit(); } static void task_high(rtems_task_argument arg) @@ -153,7 +153,7 @@ static void task_high(rtems_task_argument arg) printf("H: release done: 0\n"); - rtems_task_delete(RTEMS_SELF); + rtems_task_exit(); } static void do_ramdisk_register( @@ -267,7 +267,7 @@ static rtems_task Init(rtems_task_argument argument) printf("I: release done: 0\n"); - rtems_task_delete(RTEMS_SELF); + rtems_task_exit(); } #define CONFIGURE_INIT diff --git a/testsuites/libtests/block08/bdbuf_tests.h b/testsuites/libtests/block08/bdbuf_tests.h index 8924eb1f14..eea2661480 100644 --- a/testsuites/libtests/block08/bdbuf_tests.h +++ b/testsuites/libtests/block08/bdbuf_tests.h @@ -445,7 +445,7 @@ extern bdbuf_test_msg test_drv_msg; { \ printk("TEST FAILED (Step %s)\n", \ step_); \ - rtems_task_delete(RTEMS_SELF); \ + rtems_task_exit(); \ } \ else \ { \ @@ -475,7 +475,7 @@ extern bdbuf_test_msg test_drv_msg; "main task: %d", rc_); \ return; \ } \ - rtems_task_delete(RTEMS_SELF); \ + rtems_task_exit(); \ } while (0) #define TEST_FAILED() \ diff --git a/testsuites/libtests/block10/init.c b/testsuites/libtests/block10/init.c index d5ac44ad53..89f1ac2666 100644 --- a/testsuites/libtests/block10/init.c +++ b/testsuites/libtests/block10/init.c @@ -249,7 +249,7 @@ static void task_purger(rtems_task_argument arg) purge('P'); } - rtems_task_delete(RTEMS_SELF); + rtems_task_exit(); } static void activate_purger(rtems_task_priority prio) @@ -270,7 +270,7 @@ static void task_waiter(rtems_task_argument arg) do_rel('W', bd); } - rtems_task_delete(RTEMS_SELF); + rtems_task_exit(); } static void create_waiter(void) diff --git a/testsuites/libtests/capture01/test1.c b/testsuites/libtests/capture01/test1.c index 48d08c42de..c03c08bcd1 100644 --- a/testsuites/libtests/capture01/test1.c +++ b/testsuites/libtests/capture01/test1.c @@ -66,7 +66,7 @@ capture_CT1a (rtems_task_argument arg) capture_CT1a_deleted = 1; - rtems_task_delete (RTEMS_SELF); + rtems_task_exit(); } static void @@ -79,7 +79,7 @@ capture_CT1b (rtems_task_argument arg) capture_CT1b_deleted = 1; - rtems_task_delete (RTEMS_SELF); + rtems_task_exit(); } static void @@ -102,7 +102,7 @@ capture_CT1c (rtems_task_argument arg) capture_CT1c_deleted = 1; - rtems_task_delete (RTEMS_SELF); + rtems_task_exit(); } void capture_test_1 () @@ -149,7 +149,7 @@ void capture_test_1 () if (sc != RTEMS_SUCCESSFUL) { printf ("error: Test 1: cannot start CT1a: %s\n", rtems_status_text (sc)); - rtems_task_delete (id[0]); + rtems_task_exit(); rtems_semaphore_delete (mutex); return; } @@ -166,7 +166,7 @@ void capture_test_1 () if (sc != RTEMS_SUCCESSFUL) { printf ("error: Test 1: cannot create CT1b: %s\n", rtems_status_text (sc)); - rtems_task_delete (id[0]); + rtems_task_exit(); rtems_semaphore_delete (mutex); return; } @@ -176,8 +176,8 @@ void capture_test_1 () if (sc != RTEMS_SUCCESSFUL) { printf ("error: Test 1: cannot start CT1b: %s\n", rtems_status_text (sc)); - rtems_task_delete (id[1]); - rtems_task_delete (id[0]); + rtems_task_exit(); + rtems_task_exit(); rtems_semaphore_delete (mutex); return; } @@ -194,8 +194,8 @@ void capture_test_1 () if (sc != RTEMS_SUCCESSFUL) { printf ("error: Test 1: cannot create CT1c: %s\n", rtems_status_text (sc)); - rtems_task_delete (id[1]); - rtems_task_delete (id[0]); + rtems_task_exit(); + rtems_task_exit(); rtems_semaphore_delete (mutex); return; } @@ -205,9 +205,9 @@ void capture_test_1 () if (sc != RTEMS_SUCCESSFUL) { printf ("error: Test 1: cannot start CT1c: %s\n", rtems_status_text (sc)); - rtems_task_delete (id[2]); - rtems_task_delete (id[1]); - rtems_task_delete (id[0]); + rtems_task_exit(); + rtems_task_exit(); + rtems_task_exit(); rtems_semaphore_delete (mutex); return; } @@ -224,9 +224,9 @@ void capture_test_1 () if (!loops) { printf ("error: Test 1: test tasks did not delete\n"); - rtems_task_delete (id[2]); - rtems_task_delete (id[1]); - rtems_task_delete (id[0]); + rtems_task_exit(); + rtems_task_exit(); + rtems_task_exit(); } sc = rtems_semaphore_delete (mutex); diff --git a/testsuites/libtests/cpuuse/init.c b/testsuites/libtests/cpuuse/init.c index 11fb273733..42dcaa505e 100644 --- a/testsuites/libtests/cpuuse/init.c +++ b/testsuites/libtests/cpuuse/init.c @@ -110,5 +110,5 @@ rtems_task Init( * times will not add up to the time since last CPU Usage Reset. */ status = rtems_task_suspend( RTEMS_SELF ); - directive_failed( status, "rtems_task_delete of RTEMS_SELF" ); + directive_failed( status, "rtems_task_suspend of RTEMS_SELF" ); } diff --git a/testsuites/libtests/exit01/init.c b/testsuites/libtests/exit01/init.c index 82e59a6286..f8784ecb67 100644 --- a/testsuites/libtests/exit01/init.c +++ b/testsuites/libtests/exit01/init.c @@ -101,8 +101,7 @@ static void Init(rtems_task_argument arg) sc = rtems_task_start(id, exit_task, 0); assert(sc == RTEMS_SUCCESSFUL); - sc = rtems_task_delete(RTEMS_SELF); - assert(sc == RTEMS_SUCCESSFUL); + rtems_task_exit(); } #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER diff --git a/testsuites/libtests/exit02/init.c b/testsuites/libtests/exit02/init.c index 19a1517d8e..67eb1c93f7 100644 --- a/testsuites/libtests/exit02/init.c +++ b/testsuites/libtests/exit02/init.c @@ -79,8 +79,7 @@ static void Init(rtems_task_argument arg) sc = rtems_task_start(id, exit_task, 0); assert(sc == RTEMS_SUCCESSFUL); - sc = rtems_task_delete(RTEMS_SELF); - assert(sc == RTEMS_SUCCESSFUL); + rtems_task_exit(); } #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER diff --git a/testsuites/libtests/malloctest/init.c b/testsuites/libtests/malloctest/init.c index 577f557a85..a775129f0d 100644 --- a/testsuites/libtests/malloctest/init.c +++ b/testsuites/libtests/malloctest/init.c @@ -1372,8 +1372,7 @@ rtems_task Init( status = rtems_task_start( Task_id[ 5 ], Task_1_through_5, 0 ); directive_failed( status, "rtems_task_start of TA5" ); - status = rtems_task_delete( RTEMS_SELF ); - directive_failed( status, "rtems_task_delete of RTEMS_SELF" ); + rtems_task_exit(); } static void test_early_malloc( void ) diff --git a/testsuites/libtests/monitor/init.c b/testsuites/libtests/monitor/init.c index 15112285d9..6fe78a144f 100644 --- a/testsuites/libtests/monitor/init.c +++ b/testsuites/libtests/monitor/init.c @@ -86,8 +86,7 @@ rtems_task Init( if (status == RTEMS_SUCCESSFUL) { rtems_monitor_init( 0 ); - status = rtems_task_delete( RTEMS_SELF ); - directive_failed( status, "rtems_task_delete of RTEMS_SELF" ); + rtems_task_exit(); } else { TEST_END(); diff --git a/testsuites/libtests/stackchk/init.c b/testsuites/libtests/stackchk/init.c index 72e3c23731..2ded41a549 100644 --- a/testsuites/libtests/stackchk/init.c +++ b/testsuites/libtests/stackchk/init.c @@ -84,8 +84,7 @@ rtems_task Init( status = rtems_task_start( Task_id[ 3 ], Task_1_through_3, 0 ); directive_failed( status, "rtems_task_start of TA3" ); - status = rtems_task_delete( RTEMS_SELF ); - directive_failed( status, "rtems_task_delete of RTEMS_SELF" ); + rtems_task_exit(); } void Fatal_extension( |