From 7e9e8245be798dd903cb40e5aabddb5e362dbe1e Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Wed, 21 Jul 2010 19:25:44 -0400
Subject: [PATCH] Use --union for hpc sum
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

… which fixes the issue noted in the previous commit (almost a brown
paper bag change).
---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index e59d6dd8a..41c491730 100644
--- a/Makefile
+++ b/Makefile
@@ -98,7 +98,8 @@ live-test: all
 	rm -f *.tix *.mix
 	./live-test.sh
 	# combine the tix files
-	hpc sum $(HPCEXCL) $(addsuffix .tix,$(HPROGS)) --output=live-test.tix
+	hpc sum --union $(HPCEXCL) $(addsuffix .tix,$(HPROGS)) \
+	  --output=live-test.tix
 ifeq ($(T),markup)
 	mkdir -p coverage
 	hpc markup --destdir=coverage live-test $(HPCEXCL)
-- 
GitLab