From 6b73a9a2887fb45fc43b75c918daf0b50d2a44b9 Mon Sep 17 00:00:00 2001
From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Fri, 13 Jun 2014 15:32:50 +0200
Subject: tests: Don't use stderr for informational messages

These should go to stdout instead. The next patch will clean this up
with cocci, so no change from fprintf(stdout, to printf( here.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
 lib/igt.cocci       |  1 +
 tests/gem_stress.c  |  2 +-
 tests/testdisplay.c | 34 +++++++++++++++++-----------------
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/lib/igt.cocci b/lib/igt.cocci
index 78ef9a5c..a5f7c2db 100644
--- a/lib/igt.cocci
+++ b/lib/igt.cocci
@@ -1,3 +1,4 @@
+// Replace open-coded augmented igt_assert/skip/require with macro versions
 @@
 expression Ec;
 expression list[n] Ep;
diff --git a/tests/gem_stress.c b/tests/gem_stress.c
index e6a6ce69..df2cf250 100644
--- a/tests/gem_stress.c
+++ b/tests/gem_stress.c
@@ -924,7 +924,7 @@ int main(int argc, char **argv)
 
 	fan_in_and_check();
 
-	fprintf(stderr, "num failed tiles %u, max incoherent bytes %zd\n",
+	fprintf(stdout, "num failed tiles %u, max incoherent bytes %zd\n",
 		stats.num_failed, stats.max_failed_reads*sizeof(uint32_t));
 
 	intel_batchbuffer_free(batch);
diff --git a/tests/testdisplay.c b/tests/testdisplay.c
index 125e7d2f..9ed3ff66 100644
--- a/tests/testdisplay.c
+++ b/tests/testdisplay.c
@@ -675,22 +675,22 @@ static char optstr[] = "3hiaf:s:d:p:mrto:j:";
 
 static void __attribute__((noreturn)) usage(char *name)
 {
-	fprintf(stderr, "usage: %s [-hiasdpmtf]\n", name);
-	fprintf(stderr, "\t-i\tdump info\n");
-	fprintf(stderr, "\t-a\ttest all modes\n");
-	fprintf(stderr, "\t-s\t<duration>\tsleep between each mode test\n");
-	fprintf(stderr, "\t-d\t<depth>\tbit depth of scanout buffer\n");
-	fprintf(stderr, "\t-p\t<planew,h>,<crtcx,y>,<crtcw,h> test overlay plane\n");
-	fprintf(stderr, "\t-m\ttest the preferred mode\n");
-	fprintf(stderr, "\t-3\ttest all 3D modes\n");
-	fprintf(stderr, "\t-t\tuse a tiled framebuffer\n");
-	fprintf(stderr, "\t-j\tdo dpms off, optional arg to select dpms leve (1-3)\n");
-	fprintf(stderr, "\t-r\tprint a QR code on the screen whose content is \"pass\" for the automatic test\n");
-	fprintf(stderr, "\t-o\t<id of the display>,<number of the mode>\tonly test specified mode on the specified display\n");
-	fprintf(stderr, "\t-f\t<clock MHz>,<hdisp>,<hsync-start>,<hsync-end>,<htotal>,\n");
-	fprintf(stderr, "\t\t<vdisp>,<vsync-start>,<vsync-end>,<vtotal>\n");
-	fprintf(stderr, "\t\ttest force mode\n");
-	fprintf(stderr, "\tDefault is to test all modes.\n");
+	fprintf(stdout, "usage: %s [-hiasdpmtf]\n", name);
+	fprintf(stdout, "\t-i\tdump info\n");
+	fprintf(stdout, "\t-a\ttest all modes\n");
+	fprintf(stdout, "\t-s\t<duration>\tsleep between each mode test\n");
+	fprintf(stdout, "\t-d\t<depth>\tbit depth of scanout buffer\n");
+	fprintf(stdout, "\t-p\t<planew,h>,<crtcx,y>,<crtcw,h> test overlay plane\n");
+	fprintf(stdout, "\t-m\ttest the preferred mode\n");
+	fprintf(stdout, "\t-3\ttest all 3D modes\n");
+	fprintf(stdout, "\t-t\tuse a tiled framebuffer\n");
+	fprintf(stdout, "\t-j\tdo dpms off, optional arg to select dpms leve (1-3)\n");
+	fprintf(stdout, "\t-r\tprint a QR code on the screen whose content is \"pass\" for the automatic test\n");
+	fprintf(stdout, "\t-o\t<id of the display>,<number of the mode>\tonly test specified mode on the specified display\n");
+	fprintf(stdout, "\t-f\t<clock MHz>,<hdisp>,<hsync-start>,<hsync-end>,<htotal>,\n");
+	fprintf(stdout, "\t\t<vdisp>,<vsync-start>,<vsync-end>,<vtotal>\n");
+	fprintf(stdout, "\t\ttest force mode\n");
+	fprintf(stdout, "\tDefault is to test all modes.\n");
 	exit(0);
 }
 
@@ -797,7 +797,7 @@ int main(int argc, char **argv)
 			break;
 		case 'd':
 			depth = atoi(optarg);
-			fprintf(stderr, "using depth %d\n", depth);
+			fprintf(stdout, "using depth %d\n", depth);
 			break;
 		case 'p':
 			if (sscanf(optarg, "%d,%d,%d,%d,%d,%d", &plane_width,
-- 
cgit v1.2.3