From 7b00c2fac57740963d3c4d8bf1cf5eab3a31f22e Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Mon, 6 Nov 2017 07:56:17 +0100
Subject: tests: Use <tmacros.h> in all tests

Update #3170.
Update #3199.
---
 testsuites/samples/paranoia/Makefile.am | 2 ++
 testsuites/samples/paranoia/init.c      | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'testsuites/samples/paranoia')

diff --git a/testsuites/samples/paranoia/Makefile.am b/testsuites/samples/paranoia/Makefile.am
index 36e6bbb9d9..40c216ae3a 100644
--- a/testsuites/samples/paranoia/Makefile.am
+++ b/testsuites/samples/paranoia/Makefile.am
@@ -9,6 +9,8 @@ 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
+
 #  -DCYGNUS   turns on more verbose msgs
 AM_CPPFLAGS += -DNOSIGNAL -DCYGNUS -DNOMAIN
 
diff --git a/testsuites/samples/paranoia/init.c b/testsuites/samples/paranoia/init.c
index c5110e2722..f2420baaf6 100644
--- a/testsuites/samples/paranoia/init.c
+++ b/testsuites/samples/paranoia/init.c
@@ -14,7 +14,7 @@
 #define CONFIGURE_INIT
 #include "system.h"
 #include <stdio.h>
-#include <stdlib.h> /* exit */
+#include <tmacros.h>
 
 extern int paranoia(int, char **);
 
@@ -36,8 +36,8 @@ rtems_task Init(
 #endif
 
   rtems_print_printer_fprintf_putc(&rtems_test_printer);
-  rtems_test_begin();
+  TEST_BEGIN();
   paranoia(1, args);
-  rtems_test_end();
-  exit( 0 );
+  TEST_END();
+  rtems_test_exit( 0 );
 }
-- 
cgit v1.2.3