Changeset fafa9e2 in rtems-libbsd

Timestamp:

Nov 13, 2013, 4:20:01 PM (7 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

4.11, b96abfd647154f10ea8f7fac68e25676636eded5, debc0aed8b9bef9996b8ec0ae7a70b0b41912e27, 68e79b6d187fe09b0a6f3f1d22c69b4121a3f76e, freebsd-9.3, 33bfaee89aa71d2252eb48d6b9a9ec17183faced

Children:

6ab78d6

Parents:

c2f6513

git-author:

Sebastian Huber <sebastian.huber@…> (11/13/13 16:20:01)

git-committer:

Sebastian Huber <sebastian.huber@…> (11/13/13 16:44:40)

Message:

testsuite: Simplify tests

Location:

testsuite

Files:

• commands01/test_main.c (modified) (3 diffs)
• include/rtems/bsd/test/default-init.h (modified) (3 diffs)
• init01/test_main.c (modified) (1 diff)
• loopback01/test_main.c (modified) (1 diff)
• netshell01/test_main.c (modified) (1 diff)
• rwlock01/test_main.c (modified) (3 diffs)
• selectpollkqueue01/test_main.c (modified) (2 diffs)
• sleep01/test_main.c (modified) (3 diffs)
• syscalls01/test_main.c (modified) (1 diff)
• thread01/test_main.c (modified) (2 diffs)

testsuite/commands01/test_main.c

@@ -41 +41 @@
 
 #include <rtems/libcsupport.h>
-#include <rtems/stackchk.h>
 
 #define TEST_NAME "LIBBSD COMMANDS 1"
 
 #define ARGC(x) (nitems(x) - 1)
-
-static void
-set_self_prio(rtems_task_priority prio)
-{
-        rtems_status_code sc;
-
-        sc = rtems_task_set_priority(RTEMS_SELF, prio, &prio);
-        assert(sc == RTEMS_SUCCESSFUL);
-}
 
 static void
@@ -271 +261 @@
 test_main(void)
 {
-        /*
-         * Let other tasks run to complete background work that frees allocated
-         * resources.
-         */
-        set_self_prio(RTEMS_MAXIMUM_PRIORITY - 1);
-
         test_route_without_if();
         test_ifconfig_lo0();
@@ -284 +268 @@
         test_netstat();
 
-        rtems_stack_checker_report_usage_with_plugin(NULL,
-            rtems_printf_plugin);
-
-        puts("*** END OF " TEST_NAME " TEST ***");
         exit(0);
 }

testsuite/include/rtems/bsd/test/default-init.h

@@ -7 +7 @@
 
 #include <bsp.h>
+#include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <rtems/stackchk.h>
 #include <rtems/bsd/bsd.h>
+
+static void default_set_self_prio( rtems_task_priority prio )
+{
+  rtems_status_code sc;
+
+  sc = rtems_task_set_priority(RTEMS_SELF, prio, &prio);
+  assert(sc == RTEMS_SUCCESSFUL);
+}
+
+static void default_on_exit( int exit_code, void *arg )
+{
+  rtems_stack_checker_report_usage_with_plugin(
+    NULL,
+    rtems_printf_plugin
+  );
+
+  if ( exit_code == 0 ) {
+    puts( "*** END OF TEST " TEST_NAME " ***" );
+  }
+}
 
 rtems_task Init(
@@ -15 +37 @@
 )
 {
+  rtems_status_code sc;
+
   puts( "*** " TEST_NAME " TEST ***" );
 
@@ -23 +47 @@
    */
 
+  on_exit( default_on_exit, NULL );
+
+  /* Let other tasks run to complete background work */
+  default_set_self_prio( RTEMS_MAXIMUM_PRIORITY - 1 );
+
   rtems_bsd_initialize_with_interrupt_server();
+
+  /* Let the callout timer allocate its resources */
+  sc = rtems_task_wake_after( 2 );
+  assert(sc == RTEMS_SUCCESSFUL);
 
   test_main();
   /* should not return */
 
-  printf( "*** Test main returned and should not have ***\n" );
-  exit( 5 );
+  assert( 0 );
 }
 

testsuite/init01/test_main.c

@@ -15 +15 @@
   sleep( 5 );
 
-  puts( "*** END OF " TEST_NAME " TEST ***" );
   exit( 0 );
 }

testsuite/loopback01/test_main.c

@@ -296 +296 @@
   waitForClientEvents(argToClientEvent(4) | argToClientEvent(5) | argToClientEvent(6));
 
-  puts( "*** END OF " TEST_NAME " TEST ***" );
   exit( 0 );
 }

testsuite/netshell01/test_main.c

@@ -23 +23 @@
   rtems_shell_main_loop( &env );
 
-  puts( "*** END OF " TEST_NAME " TEST ***" );
   exit( 0 );
 }

testsuite/rwlock01/test_main.c

@@ -44 +44 @@
 
 #include <rtems/libcsupport.h>
-#include <rtems/stackchk.h>
 #include <rtems.h>
 
@@ -507 +506 @@
 alloc_basic_resources(void)
 {
-        rtems_status_code sc;
-
         curthread;
-
-        sc = rtems_task_wake_after(2);
-        assert(sc == RTEMS_SUCCESSFUL);
 }
 
@@ -549 +543 @@
         assert(rtems_resource_snapshot_check(&snapshot_0));
 
-        rtems_stack_checker_report_usage_with_plugin(NULL,
-            rtems_printf_plugin);
-
-        puts("*** END OF " TEST_NAME " TEST ***");
         exit(0);
 }

testsuite/selectpollkqueue01/test_main.c

@@ -54 +54 @@
 
 #include <rtems/libcsupport.h>
-#include <rtems/stackchk.h>
 #include <rtems.h>
 
@@ -988 +987 @@
         test_kqueue_close(ctx);
 
-        rtems_stack_checker_report_usage_with_plugin(NULL,
-            rtems_printf_plugin);
-
-        puts("*** END OF " TEST_NAME " TEST ***");
         exit(0);
 }

testsuite/sleep01/test_main.c

@@ -44 +44 @@
 
 #include <rtems/libcsupport.h>
-#include <rtems/stackchk.h>
 
 #define TEST_NAME "LIBBSD SLEEP 1"
@@ -210 +209 @@
 alloc_basic_resources(void)
 {
-        rtems_status_code sc;
-
         curthread;
-
-        sc = rtems_task_wake_after(2);
-        assert(sc == RTEMS_SUCCESSFUL);
 }
 
@@ -235 +229 @@
         assert(rtems_resource_snapshot_check(&snapshot));
 
-        rtems_stack_checker_report_usage_with_plugin(NULL,
-            rtems_printf_plugin);
-
-        puts("*** END OF " TEST_NAME " TEST ***");
         exit(0);
 }

testsuite/syscalls01/test_main.c

@@ -1719 +1719 @@
         test_err();
 
-        puts("*** END OF " TEST_NAME " TEST ***");
         exit(0);
 }

testsuite/thread01/test_main.c

@@ -284 +284 @@
 test_main(void)
 {
-        rtems_status_code sc;
-        rtems_task_priority prio = RTEMS_MAXIMUM_PRIORITY - 1;
-
         main_task_id = rtems_task_self();
-
-        sc = rtems_task_set_priority(RTEMS_SELF, prio, &prio);
-        assert(sc == RTEMS_SUCCESSFUL);
 
         test_non_bsd_thread();
@@ -298 +292 @@
         test_rtems_bsd_get_curthread_or_null();
 
-        puts("*** END OF " TEST_NAME " TEST ***");
         exit(0);
 }