diff options
| author | Chris Johns <chrisj@rtems.org> | 2016-05-20 18:39:50 +1000 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2016-05-25 15:47:34 +1000 |
| commit | 24d0ee57a4d95f99be6e7e60bd162a30daf0638d (patch) | |
| tree | 94239c8cc6b21813ca44b6ca89da73f9038914cc /testsuites/sptests/spprintk | |
| parent | psxtests/psxmsgq01: Fix typo (diff) | |
| download | rtems-24d0ee57a4d95f99be6e7e60bd162a30daf0638d.tar.bz2 | |
cpukit, testsuite: Add rtems_printf and rtems_printer support.
This change adds rtems_printf and related functions and wraps the
RTEMS print plugin support into a user API. All references to the
plugin are removed and replaced with the rtems_printer interface.
Printk and related functions are made to return a valid number of
characters formatted and output.
The function attribute to check printf functions has been added
to rtems_printf and printk. No changes to remove warrnings are part
of this patch set.
The testsuite has been moved over to the rtems_printer. The testsuite
has a mix of rtems_printer access and direct print control via the
tmacros.h header file. The support for begink/endk has been removed
as it served no purpose and only confused the code base. The testsuite
has not been refactored to use rtems_printf. This is future work.
Diffstat (limited to 'testsuites/sptests/spprintk')
| -rw-r--r-- | testsuites/sptests/spprintk/init.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/testsuites/sptests/spprintk/init.c b/testsuites/sptests/spprintk/init.c index eea17adcf2..8086a1ae10 100644 --- a/testsuites/sptests/spprintk/init.c +++ b/testsuites/sptests/spprintk/init.c @@ -13,11 +13,19 @@ #include "config.h" #endif +#define TESTS_USE_PRINTK #include <tmacros.h> -#include <rtems/bspIo.h> +#include <rtems/print.h> const char rtems_test_name[] = "SPPRINTK"; +/* + * Undefined the RTEMS_PRINTF_ATTRIBUTE and make it nothing. The test code + * contained in the file is suppose to be wrong. + */ +#undef RTEMS_PRINTF_ATTRIBUTE +#define RTEMS_PRINTF_ATTRIBUTE(_a, _b) + /* forward declarations to avoid warnings */ rtems_task Init(rtems_task_argument argument); int test_getchar(void); @@ -38,7 +46,7 @@ void do_getchark(void) poll_char = BSP_poll_char; BSP_poll_char = NULL; - + putk( "getchark - NULL getchar method - return -1" ); sc = getchark(); rtems_test_assert( sc == -1 ); @@ -124,7 +132,7 @@ rtems_task Init( rtems_task_argument argument ) { - rtems_test_begink(); + TEST_BEGIN(); do_putk(); putk(""); @@ -134,7 +142,7 @@ rtems_task Init( do_getchark(); - rtems_test_endk(); + TEST_END(); rtems_test_exit( 0 ); } @@ -151,4 +159,3 @@ rtems_task Init( #define CONFIGURE_INIT #include <rtems/confdefs.h> - |