Refactor so tests verify stdout against the same file

Author: mbucc

test/Makefile

@@ -17,6 +17,7 @@ test:
 .PHONY: clean
 clean:
 	rm -f *_stderr.out
-	rm -f *_actual.txt
+	rm -f 1.out
+	rm -f stdout.actual
 	rm -f *startup.log
 	rm -f *_tmp.txt

test/README

@@ -1,12 +1,16 @@
 Run a set of shmig commands against each backend.
 
+Starts up MySQL and PostgreSql databases in a Docker container.
+
 Requires:
 
-	1. mysql client installed and on PATH
+	1. sqlite3 is installed
+
+	2. mysql client installed and on PATH
 
-	2. psql client installed and on PATH
+	3. psql client installed and on PATH
 
-	3. docker running
+	4. Docker running
 
 Sample output:
 

test/mysql_expected.txt

@@ -1,7 +1,6 @@
 #! /bin/sh
 # Run shmig tests against a database server.
 
-source report.sh
 
 [ "x$1" = "x" ] && printf "usage: %s <testsuite>\n" $(basename $0) >&2 && exit 1
 
@@ -117,10 +116,9 @@ esac
 #
 #-----------------------------------------------------------------------------
 
-report_start $DB
-
-F=$(report_filename $DB)
+printf "%-10s .......... " $DB
 
+F=1.out
 rm -f $F
 rm -f *_stderr.out
 
@@ -160,5 +158,22 @@ case $DB in
 esac
 
 
+#
+#		Replace time stamps with the string "*now*" and change tabs to '|'
+#		in MySQL output.
+#
+
+sed 's/20..-[012].-[0123]. ..:..:..\(\.[0-9]*\)*/*now*/' $F | sed 's/	/|/g' > stdout.actual
+
+
+#
+#		Use diff to get test result.
+#
 
-report_result $DB
+if diff -uw stdout.expected stdout.actual >/dev/null
+then
+	printf "PASS\n" $1
+else
+	printf "FAIL (diff below)\n" $1
+	diff -uw stdout.expected stdout.actual
+fi