Fix test-suite to handle stdout and stderr separately, and fix up tests

test-suite merged stdout and stderr, which relied on the ordering of data from
the two streams in the merged stream.  This made test-suite frequently fail on
tests with both output and errors, when the ordering didn't happen to match
what the test assumed.  Handle each of the streams separately, and update the
tests accordingly.

Also clean up the output of "test-suite format" to avoid outputting values
equal to the defaults.

Signed-off-by: Josh Triplett <josh@freedesktop.org>

1 files changed, 7 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index d306f5b..7e754b9 100644
--- a/Makefile
+++ b/Makefile
@@ -188,5 +188,10 @@ check: all
 	$(Q)cd validation && ./test-suite
 
 clean-check:
-	find validation/ -name "*.c.[egd]*" -exec rm {} \;
-
+	find validation/ \( -name "*.c.output.expected" \
+	                 -o -name "*.c.output.got" \
+	                 -o -name "*.c.output.diff" \
+	                 -o -name "*.c.error.expected" \
+	                 -o -name "*.c.error.got" \
+	                 -o -name "*.c.error.diff" \
+	                 \) -exec rm {} \;