Save test result to a temp file instead of piping it to diff

This makes tests more robust.

22 files changed, 88 insertions, 21 deletions

diff --git a/.gitignore b/.gitignore
index 53c48be..15db638 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,10 @@
 *.l
 *.l.cpp-options
 
+# Test output
+#
+*.out
+
 # Generated documentation.
 #
 *.pdf
diff --git a/common/auto/makefile b/common/auto/makefile
index e4cdffd..30d480a 100644
--- a/common/auto/makefile
+++ b/common/auto/makefile
@@ -67,7 +67,9 @@ $(dist):
 $(test): $(driver) $(src_base)/test.std
 	$(call message,sql $$1,$(dcf_root)/db-driver $$1, $(src_base)/test.sql)
 	$(call message,test $<,$< --options-file $(dcf_root)/db.options \
-| diff -u $(src_base)/test.std -)
+>$(out_base)/test.out)
+	$(call message,,diff -u $(src_base)/test.std $(out_base)/test.out)
+	$(call message,,rm -f $(out_base)/test.out)
 
 # Clean.
 #
@@ -76,6 +78,7 @@ $(clean):                            \
   $(addsuffix .cxx.clean,$(cxx_obj)) \
   $(addsuffix .cxx.clean,$(cxx_od))  \
   $(addprefix $(out_base)/,$(odb_hdr:.hxx=-odb.cxx.hxx.clean))
+	$(call message,,rm -f $(out_base)/test.out)
 
 # Generated .gitignore.
 #
diff --git a/common/composite/makefile b/common/composite/makefile
index 577cad6..81f32f0 100644
--- a/common/composite/makefile
+++ b/common/composite/makefile
@@ -68,7 +68,9 @@ $(dist):
 $(test): $(driver) $(src_base)/test.std
 	$(call message,sql $$1,$(dcf_root)/db-driver $$1, $(src_base)/test.sql)
 	$(call message,test $<,$< --options-file $(dcf_root)/db.options \
-| diff -u $(src_base)/test.std -)
+>$(out_base)/test.out)
+	$(call message,,diff -u $(src_base)/test.std $(out_base)/test.out)
+	$(call message,,rm -f $(out_base)/test.out)
 
 # Clean.
 #
@@ -77,6 +79,7 @@ $(clean):                            \
   $(addsuffix .cxx.clean,$(cxx_obj)) \
   $(addsuffix .cxx.clean,$(cxx_od))  \
   $(addprefix $(out_base)/,$(odb_hdr:.hxx=-odb.cxx.hxx.clean))
+	$(call message,,rm -f $(out_base)/test.out)
 
 # Generated .gitignore.
 #
diff --git a/common/const/makefile b/common/const/makefile
index e8759bc..d465721 100644
--- a/common/const/makefile
+++ b/common/const/makefile
@@ -68,7 +68,9 @@ $(dist):
 $(test): $(driver) $(src_base)/test.std
 	$(call message,sql $$1,$(dcf_root)/db-driver $$1, $(src_base)/test.sql)
 	$(call message,test $<,$< --options-file $(dcf_root)/db.options \
-| diff -u $(src_base)/test.std -)
+>$(out_base)/test.out)
+	$(call message,,diff -u $(src_base)/test.std $(out_base)/test.out)
+	$(call message,,rm -f $(out_base)/test.out)
 
 # Clean.
 #
@@ -77,6 +79,7 @@ $(clean):                            \
   $(addsuffix .cxx.clean,$(cxx_obj)) \
   $(addsuffix .cxx.clean,$(cxx_od))  \
   $(addprefix $(out_base)/,$(odb_hdr:.hxx=-odb.cxx.hxx.clean))
+	$(call message,,rm -f $(out_base)/test.out)
 
 # Generated .gitignore.
 #
diff --git a/common/container/makefile b/common/container/makefile
index 450da44..9fe50af 100644
--- a/common/container/makefile
+++ b/common/container/makefile
@@ -67,7 +67,9 @@ $(dist):
 $(test): $(driver) $(src_base)/test.std
 	$(call message,sql $$1,$(dcf_root)/db-driver $$1, $(src_base)/test.sql)
 	$(call message,test $<,$< --options-file $(dcf_root)/db.options \
-| diff -u $(src_base)/test.std -)
+>$(out_base)/test.out)
+	$(call message,,diff -u $(src_base)/test.std $(out_base)/test.out)
+	$(call message,,rm -f $(out_base)/test.out)
 
 # Clean.
 #
@@ -76,6 +78,7 @@ $(clean):                            \
   $(addsuffix .cxx.clean,$(cxx_obj)) \
   $(addsuffix .cxx.clean,$(cxx_od))  \
   $(addprefix $(out_base)/,$(odb_hdr:.hxx=-odb.cxx.hxx.clean))
+	$(call message,,rm -f $(out_base)/test.out)
 
 # Generated .gitignore.
 #
diff --git a/common/ctor/makefile b/common/ctor/makefile
index 4dcd10c..489ecdd 100644
--- a/common/ctor/makefile
+++ b/common/ctor/makefile
@@ -68,7 +68,9 @@ $(dist):
 $(test): $(driver) $(src_base)/test.std
 	$(call message,sql $$1,$(dcf_root)/db-driver $$1, $(src_base)/test.sql)
 	$(call message,test $<,$< --options-file $(dcf_root)/db.options \
-| diff -u $(src_base)/test.std -)
+>$(out_base)/test.out)
+	$(call message,,diff -u $(src_base)/test.std $(out_base)/test.out)
+	$(call message,,rm -f $(out_base)/test.out)
 
 # Clean.
 #
@@ -77,6 +79,7 @@ $(clean):                            \
   $(addsuffix .cxx.clean,$(cxx_obj)) \
   $(addsuffix .cxx.clean,$(cxx_od))  \
   $(addprefix $(out_base)/,$(odb_hdr:.hxx=-odb.cxx.hxx.clean))
+	$(call message,,rm -f $(out_base)/test.out)
 
 # Generated .gitignore.
 #
diff --git a/common/inverse/makefile b/common/inverse/makefile
index e64cced..b7480fc 100644
--- a/common/inverse/makefile
+++ b/common/inverse/makefile
@@ -69,7 +69,9 @@ $(dist):
 $(test): $(driver) $(src_base)/test.std
 	$(call message,sql $$1,$(dcf_root)/db-driver $$1, $(src_base)/test.sql)
 	$(call message,test $<,$< --options-file $(dcf_root)/db.options \
-| diff -u $(src_base)/test.std -)
+>$(out_base)/test.out)
+	$(call message,,diff -u $(src_base)/test.std $(out_base)/test.out)
+	$(call message,,rm -f $(out_base)/test.out)
 
 # Clean.
 #
@@ -78,6 +80,7 @@ $(clean):                            \
   $(addsuffix .cxx.clean,$(cxx_obj)) \
   $(addsuffix .cxx.clean,$(cxx_od))  \
   $(addprefix $(out_base)/,$(odb_hdr:.hxx=-odb.cxx.hxx.clean))
+	$(call message,,rm -f $(out_base)/test.out)
 
 # Generated .gitignore.
 #
diff --git a/common/lifecycle/makefile b/common/lifecycle/makefile
index b2a6875..e2f1f66 100644
--- a/common/lifecycle/makefile
+++ b/common/lifecycle/makefile
@@ -67,7 +67,9 @@ $(dist):
 $(test): $(driver) $(src_base)/test.std
 	$(call message,sql $$1,$(dcf_root)/db-driver $$1, $(src_base)/test.sql)
 	$(call message,test $<,$< --options-file $(dcf_root)/db.options \
-| diff -u $(src_base)/test.std -)
+>$(out_base)/test.out)
+	$(call message,,diff -u $(src_base)/test.std $(out_base)/test.out)
+	$(call message,,rm -f $(out_base)/test.out)
 
 # Clean.
 #
@@ -76,6 +78,7 @@ $(clean):                            \
   $(addsuffix .cxx.clean,$(cxx_obj)) \
   $(addsuffix .cxx.clean,$(cxx_od))  \
   $(addprefix $(out_base)/,$(odb_hdr:.hxx=-odb.cxx.hxx.clean))
+	$(call message,,rm -f $(out_base)/test.out)
 
 # Generated .gitignore.
 #
diff --git a/common/query/makefile b/common/query/makefile
index 08eb33d..0775df6 100644
--- a/common/query/makefile
+++ b/common/query/makefile
@@ -69,7 +69,9 @@ $(dist):
 $(test): $(driver) $(src_base)/test.std
 	$(call message,sql $$1,$(dcf_root)/db-driver $$1, $(src_base)/test.sql)
 	$(call message,test $<,$< --options-file $(dcf_root)/db.options \
-| diff -u $(src_base)/test.std -)
+>$(out_base)/test.out)
+	$(call message,,diff -u $(src_base)/test.std $(out_base)/test.out)
+	$(call message,,rm -f $(out_base)/test.out)
 
 # Clean.
 #
@@ -78,6 +80,7 @@ $(clean):                            \
   $(addsuffix .cxx.clean,$(cxx_obj)) \
   $(addsuffix .cxx.clean,$(cxx_od))  \
   $(addprefix $(out_base)/,$(odb_hdr:.hxx=-odb.cxx.hxx.clean))
+	$(call message,,rm -f $(out_base)/test.out)
 
 # Generated .gitignore.
 #
diff --git a/common/relationship/makefile b/common/relationship/makefile
index a3857d4..7ed60cf 100644
--- a/common/relationship/makefile
+++ b/common/relationship/makefile
@@ -69,7 +69,9 @@ $(dist):
 $(test): $(driver) $(src_base)/test.std
 	$(call message,sql $$1,$(dcf_root)/db-driver $$1, $(src_base)/test.sql)
 	$(call message,test $<,$< --options-file $(dcf_root)/db.options \
-| diff -u $(src_base)/test.std -)
+>$(out_base)/test.out)
+	$(call message,,diff -u $(src_base)/test.std $(out_base)/test.out)
+	$(call message,,rm -f $(out_base)/test.out)
 
 # Clean.
 #
@@ -78,6 +80,7 @@ $(clean):                            \
   $(addsuffix .cxx.clean,$(cxx_obj)) \
   $(addsuffix .cxx.clean,$(cxx_od))  \
   $(addprefix $(out_base)/,$(odb_hdr:.hxx=-odb.cxx.hxx.clean))
+	$(call message,,rm -f $(out_base)/test.out)
 
 # Generated .gitignore.
 #
diff --git a/common/schema/makefile b/common/schema/makefile
index 5c71905..0cd51d6 100644
--- a/common/schema/makefile
+++ b/common/schema/makefile
@@ -67,7 +67,9 @@ $(dist):
 $(test): $(driver) $(src_base)/test.std
 	$(call message,sql $$1,$(dcf_root)/db-driver $$1, $(src_base)/test.sql)
 	$(call message,test $<,$< --options-file $(dcf_root)/db.options \
-| diff -u $(src_base)/test.std -)
+>$(out_base)/test.out)
+	$(call message,,diff -u $(src_base)/test.std $(out_base)/test.out)
+	$(call message,,rm -f $(out_base)/test.out)
 
 # Clean.
 #
@@ -76,6 +78,7 @@ $(clean):                            \
   $(addsuffix .cxx.clean,$(cxx_obj)) \
   $(addsuffix .cxx.clean,$(cxx_od))  \
   $(addprefix $(out_base)/,$(odb_hdr:.hxx=-odb.cxx.hxx.clean))
+	$(call message,,rm -f $(out_base)/test.out)
 
 # Generated .gitignore.
 #
diff --git a/common/template/makefile b/common/template/makefile
index cff4185..02605ef 100644
--- a/common/template/makefile
+++ b/common/template/makefile
@@ -67,7 +67,9 @@ $(dist):
 $(test): $(driver) $(src_base)/test.std
 	$(call message,sql $$1,$(dcf_root)/db-driver $$1, $(src_base)/test.sql)
 	$(call message,test $<,$< --options-file $(dcf_root)/db.options \
-| diff -u $(src_base)/test.std -)
+>$(out_base)/test.out)
+	$(call message,,diff -u $(src_base)/test.std $(out_base)/test.out)
+	$(call message,,rm -f $(out_base)/test.out)
 
 # Clean.
 #
@@ -76,6 +78,7 @@ $(clean):                            \
   $(addsuffix .cxx.clean,$(cxx_obj)) \
   $(addsuffix .cxx.clean,$(cxx_od))  \
   $(addprefix $(out_base)/,$(odb_hdr:.hxx=-odb.cxx.hxx.clean))
+	$(call message,,rm -f $(out_base)/test.out)
 
 # Generated .gitignore.
 #
diff --git a/common/threads/makefile b/common/threads/makefile
index 73174d9..71c522b 100644
--- a/common/threads/makefile
+++ b/common/threads/makefile
@@ -68,7 +68,9 @@ $(dist):
 $(test): $(driver) $(src_base)/test.std
 	$(call message,sql $$1,$(dcf_root)/db-driver $$1, $(src_base)/test.sql)
 	$(call message,test $<,$< --options-file $(dcf_root)/db.options \
-| diff -u $(src_base)/test.std -)
+>$(out_base)/test.out)
+	$(call message,,diff -u $(src_base)/test.std $(out_base)/test.out)
+	$(call message,,rm -f $(out_base)/test.out)
 
 # Clean.
 #
@@ -77,6 +79,7 @@ $(clean):                            \
   $(addsuffix .cxx.clean,$(cxx_obj)) \
   $(addsuffix .cxx.clean,$(cxx_od))  \
   $(addprefix $(out_base)/,$(odb_hdr:.hxx=-odb.cxx.hxx.clean))
+	$(call message,,rm -f $(out_base)/test.out)
 
 # Generated .gitignore.
 #
diff --git a/mysql/template/makefile b/mysql/template/makefile
index d634728..05285ec 100644
--- a/mysql/template/makefile
+++ b/mysql/template/makefile
@@ -64,7 +64,9 @@ $(dist):
 $(test): $(driver) $(src_base)/test.std
 	$(call message,sql $$1,$(dcf_root)/db-driver $$1, $(src_base)/test.sql)
 	$(call message,test $<,$< --options-file $(dcf_root)/db.options \
-| diff -u $(src_base)/test.std -)
+>$(out_base)/test.out)
+	$(call message,,diff -u $(src_base)/test.std $(out_base)/test.out)
+	$(call message,,rm -f $(out_base)/test.out)
 
 # Clean.
 #
@@ -73,6 +75,7 @@ $(clean):                            \
   $(addsuffix .cxx.clean,$(cxx_obj)) \
   $(addsuffix .cxx.clean,$(cxx_od))  \
   $(addprefix $(out_base)/,$(odb_hdr:.hxx=-odb.cxx.hxx.clean))
+	$(call message,,rm -f $(out_base)/test.out)
 
 # Generated .gitignore.
 #
diff --git a/mysql/truncation/makefile b/mysql/truncation/makefile
index 331bc34..79de168 100644
--- a/mysql/truncation/makefile
+++ b/mysql/truncation/makefile
@@ -65,7 +65,9 @@ $(dist):
 $(test): $(driver) $(src_base)/test.std
 	$(call message,sql $$1,$(dcf_root)/db-driver $$1, $(src_base)/test.sql)
 	$(call message,test $<,$< --options-file $(dcf_root)/db.options \
-| diff -u $(src_base)/test.std -)
+>$(out_base)/test.out)
+	$(call message,,diff -u $(src_base)/test.std $(out_base)/test.out)
+	$(call message,,rm -f $(out_base)/test.out)
 
 # Clean.
 #
@@ -74,6 +76,7 @@ $(clean):                            \
   $(addsuffix .cxx.clean,$(cxx_obj)) \
   $(addsuffix .cxx.clean,$(cxx_od))  \
   $(addprefix $(out_base)/,$(odb_hdr:.hxx=-odb.cxx.hxx.clean))
+	$(call message,,rm -f $(out_base)/test.out)
 
 # Generated .gitignore.
 #
diff --git a/mysql/types/makefile b/mysql/types/makefile
index 60ee402..d84614b 100644
--- a/mysql/types/makefile
+++ b/mysql/types/makefile
@@ -67,7 +67,9 @@ $(dist):
 $(test): $(driver) $(src_base)/test.std
 	$(call message,sql $$1,$(dcf_root)/db-driver $$1, $(src_base)/test.sql)
 	$(call message,test $<,$< --options-file $(dcf_root)/db.options \
-| diff -u $(src_base)/test.std -)
+>$(out_base)/test.out)
+	$(call message,,diff -u $(src_base)/test.std $(out_base)/test.out)
+	$(call message,,rm -f $(out_base)/test.out)
 
 # Clean.
 #
@@ -76,6 +78,7 @@ $(clean):                            \
   $(addsuffix .cxx.clean,$(cxx_obj)) \
   $(addsuffix .cxx.clean,$(cxx_od))  \
   $(addprefix $(out_base)/,$(odb_hdr:.hxx=-odb.cxx.hxx.clean))
+	$(call message,,rm -f $(out_base)/test.out)
 
 # Generated .gitignore.
 #
diff --git a/tracer/include/makefile b/tracer/include/makefile
index 8bb6914..6e8f00a 100644
--- a/tracer/include/makefile
+++ b/tracer/include/makefile
@@ -58,7 +58,9 @@ $(dist):
 # Test.
 #
 $(test): $(driver) $(src_base)/test.std
-	$(call message,test $<,$< | diff -u $(src_base)/test.std -)
+	$(call message,test $<,$< >$(out_base)/test.out)
+	$(call message,,diff -u $(src_base)/test.std $(out_base)/test.out)
+	$(call message,,rm -f $(out_base)/test.out)
 
 # Clean.
 #
@@ -67,6 +69,7 @@ $(clean):                            \
   $(addsuffix .cxx.clean,$(cxx_obj)) \
   $(addsuffix .cxx.clean,$(cxx_od))  \
   $(addprefix $(out_base)/,$(odb_hdr:.hxx=-odb.cxx.hxx.clean))
+	$(call message,,rm -f $(out_base)/test.out)
 
 # Generated .gitignore.
 #
diff --git a/tracer/object/makefile b/tracer/object/makefile
index b74ece7..a812671 100644
--- a/tracer/object/makefile
+++ b/tracer/object/makefile
@@ -67,7 +67,9 @@ $(dist):
 # Test.
 #
 $(test): $(driver) $(src_base)/test.std
-	$(call message,test $<,$< | diff -u $(src_base)/test.std -)
+	$(call message,test $<,$< >$(out_base)/test.out)
+	$(call message,,diff -u $(src_base)/test.std $(out_base)/test.out)
+	$(call message,,rm -f $(out_base)/test.out)
 
 # Clean.
 #
@@ -76,6 +78,7 @@ $(clean):                            \
   $(addsuffix .cxx.clean,$(cxx_obj)) \
   $(addsuffix .cxx.clean,$(cxx_od))  \
   $(addprefix $(out_base)/,$(odb_hdr:.hxx=-odb.cxx.hxx.clean))
+	$(call message,,rm -f $(out_base)/test.out)
 
 # Generated .gitignore.
 #
diff --git a/tracer/pragma/makefile b/tracer/pragma/makefile
index 1994267..b9da24c 100644
--- a/tracer/pragma/makefile
+++ b/tracer/pragma/makefile
@@ -67,7 +67,9 @@ $(dist):
 # Test.
 #
 $(test): $(driver) $(src_base)/test.std
-	$(call message,test $<,$< | diff -u $(src_base)/test.std -)
+	$(call message,test $<,$< >$(out_base)/test.out)
+	$(call message,,diff -u $(src_base)/test.std $(out_base)/test.out)
+	$(call message,,rm -f $(out_base)/test.out)
 
 # Clean.
 #
@@ -76,6 +78,7 @@ $(clean):                            \
   $(addsuffix .cxx.clean,$(cxx_obj)) \
   $(addsuffix .cxx.clean,$(cxx_od))  \
   $(addprefix $(out_base)/,$(odb_hdr:.hxx=-odb.cxx.hxx.clean))
+	$(call message,,rm -f $(out_base)/test.out)
 
 # Generated .gitignore.
 #
diff --git a/tracer/template/makefile b/tracer/template/makefile
index 4403281..023f5f9 100644
--- a/tracer/template/makefile
+++ b/tracer/template/makefile
@@ -67,7 +67,9 @@ $(dist):
 # Test.
 #
 $(test): $(driver) $(src_base)/test.std
-	$(call message,test $<,$< | diff -u $(src_base)/test.std -)
+	$(call message,test $<,$< >$(out_base)/test.out)
+	$(call message,,diff -u $(src_base)/test.std $(out_base)/test.out)
+	$(call message,,rm -f $(out_base)/test.out)
 
 # Clean.
 #
@@ -76,6 +78,7 @@ $(clean):                            \
   $(addsuffix .cxx.clean,$(cxx_obj)) \
   $(addsuffix .cxx.clean,$(cxx_od))  \
   $(addprefix $(out_base)/,$(odb_hdr:.hxx=-odb.cxx.hxx.clean))
+	$(call message,,rm -f $(out_base)/test.out)
 
 # Generated .gitignore.
 #
diff --git a/tracer/transaction/makefile b/tracer/transaction/makefile
index 12ca226..2a3baee 100644
--- a/tracer/transaction/makefile
+++ b/tracer/transaction/makefile
@@ -52,7 +52,9 @@ $(dist):
 # Test.
 #
 $(test): $(driver) $(src_base)/test.std
-	$(call message,test $<,$< | diff -u $(src_base)/test.std -)
+	$(call message,test $<,$< >$(out_base)/test.out)
+	$(call message,,diff -u $(src_base)/test.std $(out_base)/test.out)
+	$(call message,,rm -f $(out_base)/test.out)
 
 # Clean.
 #
@@ -60,6 +62,7 @@ $(clean):                            \
   $(driver).o.clean                  \
   $(addsuffix .cxx.clean,$(cxx_obj)) \
   $(addsuffix .cxx.clean,$(cxx_od))
+	$(call message,,rm -f $(out_base)/test.out)
 
 # Generated .gitignore.
 #
diff --git a/tracer/types/makefile b/tracer/types/makefile
index 474681d..f7fe190 100644
--- a/tracer/types/makefile
+++ b/tracer/types/makefile
@@ -67,7 +67,9 @@ $(dist):
 # Test.
 #
 $(test): $(driver) $(src_base)/test.std
-	$(call message,test $<,$< | diff -u $(src_base)/test.std -)
+	$(call message,test $<,$< >$(out_base)/test.out)
+	$(call message,,diff -u $(src_base)/test.std $(out_base)/test.out)
+	$(call message,,rm -f $(out_base)/test.out)
 
 # Clean.
 #
@@ -76,6 +78,7 @@ $(clean):                            \
   $(addsuffix .cxx.clean,$(cxx_obj)) \
   $(addsuffix .cxx.clean,$(cxx_od))  \
   $(addprefix $(out_base)/,$(odb_hdr:.hxx=-odb.cxx.hxx.clean))
+	$(call message,,rm -f $(out_base)/test.out)
 
 # Generated .gitignore.
 #