7 files changed, 85 insertions, 27 deletions
diff --git a/lib/diameter/test/.gitignore b/lib/diameter/test/.gitignore
index df38dfc5e3..4f19542bbe 100644
--- a/lib/diameter/test/.gitignore
+++ b/lib/diameter/test/.gitignore
@@ -1,3 +1,4 @@
 
 /log
 /depend.mk
+/coverspec
diff --git a/lib/diameter/test/Makefile b/lib/diameter/test/Makefile
index aa4b7eaeb1..061f0bcbef 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)
 
@@ -73,7 +77,7 @@ any: opt
 
 clean:
 	rm -f $(TARGET_FILES) 
-	rm -f depend.mk
+	rm -f depend.mk coverspec
 
 realclean: clean
 	rm -rf log
@@ -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
@@ -132,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 [email protected] $< > $@
+
 log:
 	mkdir $@
 
-.PHONY: $(SUITES)
+.PHONY: $(SUITES) cover
 
 # ----------------------------------------------------
 # Release Targets
diff --git a/lib/diameter/test/coverspec.sed b/lib/diameter/test/coverspec.sed
new file mode 100644
index 0000000000..5e81621593
--- /dev/null
+++ b/lib/diameter/test/coverspec.sed
@@ -0,0 +1,33 @@
+#
+# %CopyrightBegin%
+#
+# Copyright Ericsson AB 2013. All Rights Reserved.
+#
+# The contents of this file are subject to the Erlang Public License,
+# Version 1.1, (the "License"); you may not use this file except in
+# compliance with the License. You should have received a copy of the
+# Erlang Public License along with this software. If not, it can be
+# retrieved online at http://www.erlang.org/.
+#
+# Software distributed under the License is distributed on an "AS IS"
+# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+# the License for the specific language governing rights and limitations
+# under the License.
+#
+# %CopyrightEnd%
+#
+
+#
+# Morph diameter.cover into a legitimate cover spec. All that's being
+# retained is the list of excluded modules. This is used by Makefile
+# when running cover locally.
+#
+
+/^{incl_app,/{
+  i\
+{level, details}.\
+{incl_dirs, ["../ebin"]}.
+  d
+}
+
+/^{excl_mods,/s@ .*@@
diff --git a/lib/diameter/test/diameter_app_SUITE.erl b/lib/diameter/test/diameter_app_SUITE.erl
index 53332af626..209f72adf1 100644
--- a/lib/diameter/test/diameter_app_SUITE.erl
+++ b/lib/diameter/test/diameter_app_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -48,7 +48,6 @@
                            diameter_dict_parser,
                            diameter_dict_util,
                            diameter_exprecs,
-                           diameter_nowarn,
                            diameter_make]).
 
 -define(HELP_MODULES, [diameter_dbg,
diff --git a/lib/diameter/test/diameter_ct.erl b/lib/diameter/test/diameter_ct.erl
index ded50bf6c5..1697287a22 100644
--- a/lib/diameter/test/diameter_ct.erl
+++ b/lib/diameter/test/diameter_ct.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -23,16 +23,23 @@
 %% Module used to run suites from Makefile.
 %%
 
--export([run/1]).
+-export([run/1,
+         cover/0]).
 
 %% The makefile looks for signs of failure so ignore the ct:run_test/1
 %% return value.
 
-run([Suite]) ->
+run(Suites) ->
+    ct_run([{suite, Suites}]).
+
+cover() ->
+    ct_run([{spec, "./testspec"}]).
+
+ct_run(Opts) ->
     Start = info(),
-    ct:run_test([{suite, Suite},
-                 {logdir, "./log"},
-                 {auto_compile, false}]),
+    ct:run_test([{logdir, "./log"},
+                 {auto_compile, false}
+                 | Opts]),
     info(Start , info()).
 
 info() ->
diff --git a/lib/diameter/test/modules.mk b/lib/diameter/test/modules.mk
index 32e5fb4613..c4a713fb10 100644
--- a/lib/diameter/test/modules.mk
+++ b/lib/diameter/test/modules.mk
@@ -22,28 +22,28 @@ COVER_SPEC_FILE = diameter.cover
 
 MODULES = \
 	diameter_ct \
-	diameter_util \
 	diameter_enum \
-	diameter_compiler_SUITE \
+	diameter_util \
+	diameter_3xxx_SUITE \
+	diameter_app_SUITE \
+	diameter_capx_SUITE \
 	diameter_codec_SUITE \
 	diameter_codec_test \
-	diameter_app_SUITE \
+	diameter_compiler_SUITE \
 	diameter_dict_SUITE \
-	diameter_reg_SUITE \
-	diameter_sync_SUITE \
-	diameter_stats_SUITE \
-	diameter_watchdog_SUITE \
-	diameter_gen_sctp_SUITE \
-	diameter_transport_SUITE \
-	diameter_capx_SUITE \
-	diameter_traffic_SUITE \
-	diameter_relay_SUITE \
-	diameter_tls_SUITE \
-	diameter_failover_SUITE \
 	diameter_dpr_SUITE \
 	diameter_event_SUITE \
+	diameter_failover_SUITE \
+	diameter_gen_sctp_SUITE \
 	diameter_length_SUITE \
-	diameter_3xxx_SUITE
+	diameter_reg_SUITE \
+	diameter_relay_SUITE \
+	diameter_stats_SUITE \
+	diameter_sync_SUITE \
+	diameter_tls_SUITE \
+	diameter_traffic_SUITE \
+	diameter_transport_SUITE \
+	diameter_watchdog_SUITE
 
 HRL_FILES = \
 	diameter_ct.hrl
diff --git a/lib/diameter/test/testspec b/lib/diameter/test/testspec
new file mode 100644
index 0000000000..2fd8307281
--- /dev/null
+++ b/lib/diameter/test/testspec
@@ -0,0 +1,3 @@
+
+{suites, ".", all}.
+{cover, "./coverspec"}.