From 8c1f4064ad668c6bab0fb106386e9e2d33d06d31 Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Thu, 2 Nov 2017 13:56:12 +0100
Subject: tests: Use printf() instead of fprintf()

Update #3170.
Update #3199.
---
 testsuites/benchmarks/dhrystone/init.c      | 1 +
 testsuites/benchmarks/linpack/init.c        | 1 +
 testsuites/benchmarks/linpack/linpack-pc.c  | 5 +++++
 testsuites/benchmarks/whetstone/init.c      | 1 +
 testsuites/benchmarks/whetstone/whetstone.c | 4 ++++
 5 files changed, 12 insertions(+)

(limited to 'testsuites/benchmarks')

diff --git a/testsuites/benchmarks/dhrystone/init.c b/testsuites/benchmarks/dhrystone/init.c
index 3e6245c743..44c3f27683 100644
--- a/testsuites/benchmarks/dhrystone/init.c
+++ b/testsuites/benchmarks/dhrystone/init.c
@@ -32,6 +32,7 @@ static void Init(rtems_task_argument arg)
 
   TEST_BEGIN();
 
+  rtems_print_printer_fprintf_putc(&rtems_test_printer);
   main(2, argv);
 
   TEST_END();
diff --git a/testsuites/benchmarks/linpack/init.c b/testsuites/benchmarks/linpack/init.c
index c94314b41d..de5a61489f 100644
--- a/testsuites/benchmarks/linpack/init.c
+++ b/testsuites/benchmarks/linpack/init.c
@@ -32,6 +32,7 @@ static void Init(rtems_task_argument arg)
 
   TEST_BEGIN();
 
+  rtems_print_printer_fprintf_putc(&rtems_test_printer);
   main(2, argv);
 
   TEST_END();
diff --git a/testsuites/benchmarks/linpack/linpack-pc.c b/testsuites/benchmarks/linpack/linpack-pc.c
index f85e677c97..1fef18eb96 100644
--- a/testsuites/benchmarks/linpack/linpack-pc.c
+++ b/testsuites/benchmarks/linpack/linpack-pc.c
@@ -223,6 +223,11 @@
 #include <stdio.h>
 #include <math.h>
 #include <stdlib.h>
+#ifdef __rtems__
+#include <tmacros.h>
+#undef print_time
+#define fprintf(f, ...) rtems_printf(&rtems_test_printer, __VA_ARGS__)
+#endif /* __rtems__ */
 
 
 static REAL atime[9][15];
diff --git a/testsuites/benchmarks/whetstone/init.c b/testsuites/benchmarks/whetstone/init.c
index b1661186b1..2f9a34067b 100644
--- a/testsuites/benchmarks/whetstone/init.c
+++ b/testsuites/benchmarks/whetstone/init.c
@@ -32,6 +32,7 @@ static void Init(rtems_task_argument arg)
 
   TEST_BEGIN();
 
+  rtems_print_printer_fprintf_putc(&rtems_test_printer);
   main(2, argv);
 
   TEST_END();
diff --git a/testsuites/benchmarks/whetstone/whetstone.c b/testsuites/benchmarks/whetstone/whetstone.c
index aa41353e8e..e0a93aa88c 100644
--- a/testsuites/benchmarks/whetstone/whetstone.c
+++ b/testsuites/benchmarks/whetstone/whetstone.c
@@ -56,6 +56,10 @@ C**********************************************************************
 #include <stdio.h>
 #include <string.h>
 #include <math.h>
+#ifdef __rtems__
+#include <tmacros.h>
+#define fprintf(f, ...) rtems_printf(&rtems_test_printer, __VA_ARGS__)
+#endif /* __rtems__ */
 
 /* the following is optional depending on the timing function used */
 #include <sys/time.h>
-- 
cgit v1.2.3