From 9e636ec4d8ae12b87fdf4d9bd60403c734b0dead Mon Sep 17 00:00:00 2001
From: Anders Svensson <anders@erlang.org>
Date: Wed, 13 Feb 2013 15:26:00 +0100
Subject: Make tweaks

Add a 'strict' target to compile with -Werror and fix a dependency.
Reorder test suites alphabetically. The two suites that currently take
the longest to run conveniently come last.
---
 lib/diameter/test/Makefile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'lib/diameter/test/Makefile')

diff --git a/lib/diameter/test/Makefile b/lib/diameter/test/Makefile
index aa4b7eaeb1..47f84a8a42 100644
--- a/lib/diameter/test/Makefile
+++ b/lib/diameter/test/Makefile
@@ -56,7 +56,8 @@ DATA_DIRS = $(sort $(dir $(DATA)))
 ERL_COMPILE_FLAGS += +warn_export_vars \
                      +warn_unused_vars \
                      -I ../include \
-                     -I ../src/gen
+                     -I ../src/gen \
+                     $(STRICT_FLAGS)
 
 # ----------------------------------------------------
 # Targets
@@ -64,6 +65,9 @@ ERL_COMPILE_FLAGS += +warn_export_vars \
 
 all debug opt: $(TARGET_FILES)
 
+strict:
+	$(MAKE) opt STRICT_FLAGS=-Werror
+
 # Require success ...
 run: $(SUITES)
 
@@ -114,7 +118,7 @@ help:
 	@echo "        Echo some relevant variables."
 	@echo ========================================
 
-.PHONY: all any run clean debug docs help info opt realclean
+.PHONY: all any run clean debug docs help info opt realclean strict
 
 # ----------------------------------------------------
 # Special Targets
-- 
cgit v1.2.3


From b864edd81d648606a996143a99e09a538e21d47a Mon Sep 17 00:00:00 2001
From: Anders Svensson <anders@erlang.org>
Date: Mon, 18 Feb 2013 12:47:24 +0100
Subject: Add cover target to test/Makefile

---
 lib/diameter/test/Makefile | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'lib/diameter/test/Makefile')

diff --git a/lib/diameter/test/Makefile b/lib/diameter/test/Makefile
index 47f84a8a42..061f0bcbef 100644
--- a/lib/diameter/test/Makefile
+++ b/lib/diameter/test/Makefile
@@ -77,7 +77,7 @@ any: opt
 
 clean:
 	rm -f $(TARGET_FILES) 
-	rm -f depend.mk
+	rm -f depend.mk coverspec
 
 realclean: clean
 	rm -rf log
@@ -136,10 +136,21 @@ $(SUITES): log opt
 	| awk '{print} / FAILED /{rc=1} END{exit rc}' rc=0
 # Shorter in sed but requires a GNU extension (ie. Q).
 
+cover: log opt coverspec
+	$(ERL) -noinput \
+	       -pa $(realpath ../ebin) \
+	       -sname diameter_cover \
+	       -s diameter_ct cover \
+	       -s init stop \
+	| awk '{print} / FAILED /{rc=1} END{exit rc}' rc=0
+
+coverspec: diameter.cover
+	sed -f $@.sed $< > $@
+
 log:
 	mkdir $@
 
-.PHONY: $(SUITES)
+.PHONY: $(SUITES) cover
 
 # ----------------------------------------------------
 # Release Targets
-- 
cgit v1.2.3