tests: Use <tmacros.h> in all tests

Update #3170.
Update #3199.
This commit is contained in:
Sebastian Huber
2017-11-06 09:06:20 +01:00
parent d71542c8be
commit 7b00c2fac5
19 changed files with 57 additions and 95 deletions
+1
View File
@@ -8,6 +8,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 = $(loopback_OBJECTS)
LINK_LIBS = $(loopback_LDLIBS)
+3 -30
View File
@@ -8,9 +8,7 @@
#include "config.h"
#endif
#include <rtems/test.h>
#include <bsp.h>
#include <tmacros.h>
const char rtems_test_name[] = "LOOPBACK";
@@ -74,21 +72,6 @@ struct rtems_bsdnet_config rtems_bsdnet_config = {
0
};
/*
* Thread-safe output routines
*/
static rtems_id printMutex;
static void printSafe(const char *fmt, ...)
{
va_list args;
va_start(args, fmt);
rtems_semaphore_obtain(printMutex, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
vprintf(fmt, args);
rtems_semaphore_release(printMutex);
va_end(args);
}
#define printf printSafe
/*
* Spawn a task
*/
@@ -246,20 +229,10 @@ static rtems_task clientTask(rtems_task_argument arg)
rtems_task
Init (rtems_task_argument ignored)
{
rtems_status_code sc;
rtems_print_printer_fprintf_putc(&rtems_test_printer);
rtems_test_begin();
TEST_BEGIN();
sc = rtems_semaphore_create(rtems_build_name('P','m','t','x'),
1,
RTEMS_PRIORITY|RTEMS_BINARY_SEMAPHORE|RTEMS_INHERIT_PRIORITY|
RTEMS_NO_PRIORITY_CEILING|RTEMS_LOCAL,
0,
&printMutex);
if (sc != RTEMS_SUCCESSFUL)
rtems_panic("Can't create printf mutex:", rtems_status_text(sc));
printf("\"Network\" initializing!\n");
rtems_bsdnet_initialize_network();
printf("\"Network\" initialized!\n");
@@ -286,6 +259,6 @@ Init (rtems_task_argument ignored)
spawnTask(clientTask, 120, 6);
rtems_task_wake_after(500);
rtems_test_end();
TEST_END();
exit( 0 );
}