Merging bug23047 into default

2 files changed, 18 insertions, 13 deletions

diff --git a/Makefile b/Makefile
index 35797fa1..38ec8196 100644
--- a/Makefile
+++ b/Makefile
@@ -111,7 +111,11 @@ $(SOURCE_DIR)/rabbit_framing_amqp_0_8.erl: codegen.py $(AMQP_CODEGEN_DIR)/amqp_c
 
 dialyze: $(BEAM_TARGETS) $(BASIC_PLT)
 	$(ERL_EBIN) -eval \
-		"rabbit_dialyzer:halt_with_code(rabbit_dialyzer:dialyze_files(\"$(BASIC_PLT)\", \"$(BEAM_TARGETS)\"))."
+		"rabbit_dialyzer:dialyze_files(\"$(BASIC_PLT)\", \"$(BEAM_TARGETS)\")." \
+		    -eval \
+		"init:stop()."
+
+
 
 # rabbit.plt is used by rabbitmq-erlang-client's dialyze make target
 create-plt: $(RABBIT_PLT)
diff --git a/src/rabbit_dialyzer.erl b/src/rabbit_dialyzer.erl
index 51bd6b1f..a9806305 100644
--- a/src/rabbit_dialyzer.erl
+++ b/src/rabbit_dialyzer.erl
@@ -61,26 +61,27 @@ add_to_plt(PltPath, FilesString) ->
                                      {init_plt, PltPath},
                                      {output_plt, PltPath},
                                      {files, Files}]),
-    print_warnings(DialyzerWarnings),
+    print_warnings(DialyzerWarnings, fun dialyzer:format_warning/1),
     ok.
 
 dialyze_files(PltPath, ModifiedFiles) ->
     Files = string:tokens(ModifiedFiles, " "),
     DialyzerWarnings = dialyzer:run([{init_plt, PltPath},
-                                     {files, Files}]),
+                                     {files, Files},
+                                     {warnings, [behaviours,
+                                                 race_conditions]}]),
     case DialyzerWarnings of
-        [] -> io:format("~nOk~n"),
-              ok;
-        _  -> io:format("~nFAILED with the following warnings:~n"),
-              print_warnings(DialyzerWarnings),
-              fail
-    end.
-
-print_warnings(Warnings) ->
-    [io:format("~s", [dialyzer:format_warning(W)]) || W <- Warnings],
-    io:format("~n"),
+        [] -> io:format("~nOk~n");
+        _  -> io:format("~n~nFAILED with the following ~p warnings:~n~n",
+                        [length(DialyzerWarnings)]),
+              print_warnings(DialyzerWarnings, fun dialyzer:format_warning/1)
+    end,
     ok.
 
+print_warnings(Warnings, FormatFun) ->
+    [io:format("~s~n", [FormatFun(W)]) || W <- Warnings],
+    io:format("~n").
+
 otp_apps_dependencies_paths() ->
     [code:lib_dir(App, ebin) ||
         App <- [kernel, stdlib, sasl, mnesia, os_mon, ssl, eunit, tools]].