From 30895144f680a8b9a8b4b6313edb726361d36000 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 26 Nov 2010 13:50:29 +0200
Subject: Save test result to a temp file instead of piping it to diff

This makes tests more robust.
---
 tracer/include/makefile     | 5 ++++-
 tracer/object/makefile      | 5 ++++-
 tracer/pragma/makefile      | 5 ++++-
 tracer/template/makefile    | 5 ++++-
 tracer/transaction/makefile | 5 ++++-
 tracer/types/makefile       | 5 ++++-
 6 files changed, 24 insertions(+), 6 deletions(-)

(limited to 'tracer')

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.
 #
-- 
cgit v1.1