summaryrefslogtreecommitdiffstats
path: root/cpukit/libmisc/testsupport/testbeginend.c
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2016-05-20 18:39:50 +1000
committerChris Johns <chrisj@rtems.org>2016-05-25 15:47:34 +1000
commit24d0ee57a4d95f99be6e7e60bd162a30daf0638d (patch)
tree94239c8cc6b21813ca44b6ca89da73f9038914cc /cpukit/libmisc/testsupport/testbeginend.c
parentpsxtests/psxmsgq01: Fix typo (diff)
downloadrtems-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 'cpukit/libmisc/testsupport/testbeginend.c')
-rw-r--r--cpukit/libmisc/testsupport/testbeginend.c39
1 files changed, 24 insertions, 15 deletions
diff --git a/cpukit/libmisc/testsupport/testbeginend.c b/cpukit/libmisc/testsupport/testbeginend.c
index 6383b33a78..6bfc400e1e 100644
--- a/cpukit/libmisc/testsupport/testbeginend.c
+++ b/cpukit/libmisc/testsupport/testbeginend.c
@@ -18,26 +18,35 @@
#include <rtems/test.h>
-int rtems_test_begin_with_plugin(
- rtems_printk_plugin_t printf_func,
- void *printf_arg
-)
+int rtems_test_begin(void)
+{
+ return rtems_printf(
+ &rtems_test_printer,
+ TEST_BEGIN_STRING
+ );
+}
+
+int rtems_test_end(void)
{
- return (*printf_func)(
- printf_arg,
- "\n\n*** BEGIN OF TEST %s ***\n",
- rtems_test_name
+ return rtems_printf(
+ &rtems_test_printer,
+ TEST_END_STRING
);
}
-int rtems_test_end_with_plugin(
- rtems_printk_plugin_t printf_func,
- void *printf_arg
+int rtems_test_print(
+ const char* format,
+ ...
)
{
- return (*printf_func)(
- printf_arg,
- "*** END OF TEST %s ***\n",
- rtems_test_name
+ va_list ap;
+ int len;
+ va_start(ap, format);
+ len = rtems_vprintf(
+ &rtems_test_printer,
+ format,
+ ap
);
+ va_end(ap);
+ return len;
}