summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2017-11-07 08:30:59 +0100
committerSebastian Huber <sebastian.huber@embedded-brains.de>2017-11-07 08:31:40 +0100
commit32ceb38513091f2f0c68f2db369384030262eb1f (patch)
treed679f7ff96c2819dedaf64f9a8ac1b16305f6b51
parentscore: Use Processor_mask instead of cpu_set_t (diff)
downloadrtems-32ceb38513091f2f0c68f2db369384030262eb1f.tar.bz2
tests: Use <tmacros.h>
Update #3170. Update #3199.
-rw-r--r--testsuites/libtests/capture01/Makefile.am1
-rw-r--r--testsuites/libtests/capture01/init.c5
-rw-r--r--testsuites/libtests/math/init.c4
3 files changed, 6 insertions, 4 deletions
diff --git a/testsuites/libtests/capture01/Makefile.am b/testsuites/libtests/capture01/Makefile.am
index 6c0d80af0c..c7698ddd40 100644
--- a/testsuites/libtests/capture01/Makefile.am
+++ b/testsuites/libtests/capture01/Makefile.am
@@ -9,6 +9,7 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.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 a7a8e0c45a..1366164dae 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 824644f03d..a5f6802b00 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 );
}