[rtems commit] tests: Use <tmacros.h>

[Sebastian Huber]

Module:    rtems
Branch:    master
Commit:    32ceb38513091f2f0c68f2db369384030262eb1f
Changeset: http://git.rtems.org/rtems/commit/?id=32ceb38513091f2f0c68f2db369384030262eb1f

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Tue Nov  7 08:30:59 2017 +0100

tests: Use <tmacros.h>

Update #3170.
Update #3199.

---

 testsuites/libtests/capture01/Makefile.am | 1 +
 testsuites/libtests/capture01/init.c      | 5 +++--
 testsuites/libtests/math/init.c           | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/testsuites/libtests/capture01/Makefile.am b/testsuites/libtests/capture01/Makefile.am
index 6c0d80a..c7698dd 100644
--- a/testsuites/libtests/capture01/Makefile.am
+++ b/testsuites/libtests/capture01/Makefile.am
@@ -9,6 +9,7 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
+AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
 LINK_OBJS = $(capture01_OBJECTS)
 LINK_LIBS = $(capture01_LDLIBS)
diff --git a/testsuites/libtests/capture01/init.c b/testsuites/libtests/capture01/init.c
index a7a8e0c..1366164 100644
--- a/testsuites/libtests/capture01/init.c
+++ b/testsuites/libtests/capture01/init.c
@@ -26,6 +26,7 @@
 #include <rtems/monitor.h>
 #include <rtems/shell.h>
 #include <assert.h>
+#include <tmacros.h>
 
 #define ASSERT_SC(sc) assert((sc) == RTEMS_SUCCESSFUL)
 
@@ -48,7 +49,7 @@ rtems_task Init(
 
   rtems_print_printer_fprintf_putc(&rtems_test_printer);
 
-  rtems_test_begin();
+  TEST_BEGIN();
 
   rtems_task_set_priority(RTEMS_SELF, 20, &old_priority);
   rtems_task_mode(RTEMS_PREEMPT,  RTEMS_PREEMPT_MASK, &old_mode);
@@ -88,7 +89,7 @@ rtems_task Init(
   rtems_capture_print_trace_records ( 22, false );
   rtems_capture_print_trace_records ( 22, false );
 
-  rtems_test_end();
+  TEST_END();
   exit( 0 );
 
 #endif
diff --git a/testsuites/libtests/math/init.c b/testsuites/libtests/math/init.c
index 824644f..a5f6802b0 100644
--- a/testsuites/libtests/math/init.c
+++ b/testsuites/libtests/math/init.c
@@ -55,13 +55,13 @@ int main( void )
 {
 #if __rtems__
   rtems_print_printer_fprintf_putc(&rtems_test_printer);
-  rtems_test_begin();
+  TEST_BEGIN();
 #endif
 
   domath();
 
 #if __rtems__
-  rtems_test_end();
+  TEST_END();
 #endif
   exit( 0 );
 }