Revert "Map error logger warnings to warning messages by default"

This reverts commit 4c4d7fa40e5fb59854724ce74b8aa3546525cb90.

This pr is causing some test failures that were missed at first.

2 files changed, 47 insertions, 50 deletions

diff --git a/lib/kernel/doc/src/error_logger.xml b/lib/kernel/doc/src/error_logger.xml
index f49d63b5a6..df2f0b01ee 100644
--- a/lib/kernel/doc/src/error_logger.xml
+++ b/lib/kernel/doc/src/error_logger.xml
@@ -58,11 +58,12 @@
       specific events. (<c>add_report_handler/1,2</c>). Also, there is
       a useful event handler in STDLIB for multi-file logging of events,
       see <c>log_mf_h(3)</c>.</p>
-    <p>Warning events were introduced in Erlang/OTP R9C and are enabled
-      by default as of 18.0. To retain backwards compatibility with existing
-      user defined event handlers, these may be tagged as errors or info
-      using the command line flag <c><![CDATA[+W <e | i | w>]]></c>, thus
-      showing up as error or info reports in the logs.</p>
+    <p>Warning events were introduced in Erlang/OTP R9C. To retain
+      backwards compatibility, these are by default tagged as errors,
+      thus showing up as error reports in the logs. By using
+      the command line flag <c><![CDATA[+W <w | i>]]></c>, they can instead
+      be tagged as warnings or info. Tagging them as warnings may
+      require rewriting existing user defined event handlers.</p>
   </description>
   <datatypes>
     <datatype>
@@ -131,7 +132,7 @@ ok</pre>
       <desc>
         <p>Returns the current mapping for warning events. Events sent
           using <c>warning_msg/1,2</c> or <c>warning_report/1,2</c>
-          are tagged as errors, warnings (default) or info, depending
+          are tagged as errors (default), warnings or info, depending
           on the value of the command line flag <c>+W</c>.</p>
         <pre>
 os$ <input>erl</input>
@@ -139,25 +140,25 @@ Erlang (BEAM) emulator version 5.4.8 [hipe] [threads:0] [kernel-poll]
 
 Eshell V5.4.8  (abort with ^G)
 1> <input>error_logger:warning_map().</input>
-warning
-2> <input>error_logger:warning_msg("Warnings tagged as: ~p~n", [warning]).</input>
+error
+2> <input>error_logger:warning_msg("Warnings tagged as: ~p~n", [error]).</input>
 
-=WARNING REPORT==== 11-Aug-2005::15:31:55 ===
-Warnings tagged as: warning
+=ERROR REPORT==== 11-Aug-2005::15:31:23 ===
+Warnings tagged as: error
 ok
 3> 
 User switch command
  --> q
-os$ <input>erl +W e</input>
+os$ <input>erl +W w</input>
 Erlang (BEAM) emulator version 5.4.8 [hipe] [threads:0] [kernel-poll]
 
 Eshell V5.4.8  (abort with ^G)
 1> <input>error_logger:warning_map().</input>
-error
-2> <input>error_logger:warning_msg("Warnings tagged as: ~p~n", [error]).</input>
+warning
+2> <input>error_logger:warning_msg("Warnings tagged as: ~p~n", [warning]).</input>
 
-=ERROR REPORT==== 11-Aug-2005::15:31:23 ===
-Warnings tagged as: error
+=WARNING REPORT==== 11-Aug-2005::15:31:55 ===
+Warnings tagged as: warning
 ok</pre>
       </desc>
     </func>
diff --git a/lib/kernel/test/error_logger_warn_SUITE.erl b/lib/kernel/test/error_logger_warn_SUITE.erl
index 7ed901696a..2bf467610e 100644
--- a/lib/kernel/test/error_logger_warn_SUITE.erl
+++ b/lib/kernel/test/error_logger_warn_SUITE.erl
@@ -21,8 +21,8 @@
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2,
 	 init_per_testcase/2,end_per_testcase/2,
-	 basic/1,warnings_info/1,warnings_errors/1,
-	 rb_basic/1,rb_warnings_info/1,rb_warnings_errors/1,
+	 basic/1,warnings_info/1,warnings_warnings/1,
+	 rb_basic/1,rb_warnings_info/1,rb_warnings_warnings/1,
 	 rb_trunc/1,rb_utc/1,file_utc/1]).
 
 %% Internal exports.
@@ -48,8 +48,8 @@
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [basic, warnings_info, warnings_errors, rb_basic,
-     rb_warnings_info, rb_warnings_errors, rb_trunc,
+    [basic, warnings_info, warnings_warnings, rb_basic,
+     rb_warnings_info, rb_warnings_warnings, rb_trunc,
      rb_utc, file_utc].
 
 groups() -> 
@@ -88,11 +88,11 @@ warnings_info(Config) when is_list(Config) ->
     put(elw_config,Config),
     warnings_info().
 
-warnings_errors(doc) ->
-    ["Tests mapping warnings to errors functionality"];
-warnings_errors(Config) when is_list(Config) ->
+warnings_warnings(doc) ->
+    ["Tests mapping warnings to warnings functionality"];
+warnings_warnings(Config) when is_list(Config) ->
     put(elw_config,Config),
-    warnings_errors().
+    warnings_warnings().
 
 rb_basic(doc) ->
     ["Tests basic rb functionality"];
@@ -106,11 +106,11 @@ rb_warnings_info(Config) when is_list(Config) ->
     put(elw_config,Config),
     rb_warnings_info().
 
-rb_warnings_errors(doc) ->
-    ["Tests warnings as errors rb functionality"];
-rb_warnings_errors(Config) when is_list(Config) ->
+rb_warnings_warnings(doc) ->
+    ["Tests warnings as warnings rb functionality"];
+rb_warnings_warnings(Config) when is_list(Config) ->
     put(elw_config,Config),
-    rb_warnings_errors().
+    rb_warnings_warnings().
 
 rb_trunc(doc) ->
     ["Tests rb functionality on truncated data"];
@@ -190,14 +190,14 @@ basic() ->
     ?line error_msg(Node,"~p~n",[Self]),
     ?line ?EXPECT({handle_event,{error,GL,{_,"~p~n",[Self]}}}),
     ?line warning_msg(Node,"~p~n",[Self]),
-    ?line ?EXPECT({handle_event,{warning_msg,GL,{_,"~p~n",[Self]}}}),
+    ?line ?EXPECT({handle_event,{error,GL,{_,"~p~n",[Self]}}}),
     ?line info_msg(Node,"~p~n",[Self]),
     ?line ?EXPECT({handle_event,{info_msg,GL,{_,"~p~n",[Self]}}}),
     ?line Report = [{self,Self},{gl,GL},make_ref()],
     ?line error_report(Node,Report),
     ?line ?EXPECT({handle_event,{error_report,GL,{_,std_error,Report}}}),
     ?line warning_report(Node,Report),
-    ?line ?EXPECT({handle_event,{warning_report,GL,{_,std_warning,Report}}}),
+    ?line ?EXPECT({handle_event,{error_report,GL,{_,std_error,Report}}}),
     ?line info_report(Node,Report),
     ?line ?EXPECT({handle_event,{info_report,GL,{_,std_info,Report}}}),
 
@@ -217,16 +217,16 @@ warnings_info() ->
     ?line stop_node(Node),
     ok.
 
-warnings_errors() ->    
-    ?line Node = start_node(nn(),"+We"),
+warnings_warnings() ->    
+    ?line Node = start_node(nn(),"+Ww"),
     ?line ok = install_relay(Node),
     ?line Self = self(),
     ?line GL = group_leader(),
     ?line Report = [{self,Self},{gl,GL},make_ref()],
     ?line warning_msg(Node,"~p~n",[Self]),
-    ?line ?EXPECT({handle_event,{error,GL,{_,"~p~n",[Self]}}}),
+    ?line ?EXPECT({handle_event,{warning_msg,GL,{_,"~p~n",[Self]}}}),
     ?line warning_report(Node,Report),
-    ?line ?EXPECT({handle_event,{error_report,GL,{_,std_error,Report}}}),
+    ?line ?EXPECT({handle_event,{warning_report,GL,{_,std_warning,Report}}}),
     ?line stop_node(Node),
     ok.
     
@@ -363,14 +363,10 @@ rb_basic() ->
     ?line application:start(sasl),
     ?line rb:start([{report_dir, rd()}]),
     ?line rb:list(),
-    ?line true = (one_rb_lines([warning]) > 1),
-    ?line true = (one_rb_lines([warning_report]) > 1),
-    ?line 0 = one_rb_findstr([error],pid_to_list(Self)),
-    ?line 0 = one_rb_findstr([error_report],pid_to_list(Self)),
-    ?line 1 = one_rb_findstr([warning],pid_to_list(Self)),
-    ?line 1 = one_rb_findstr([warning_report],pid_to_list(Self)),
-    ?line 0 = one_rb_findstr([info],pid_to_list(Self)),
-    ?line 0 = one_rb_findstr([info_report],pid_to_list(Self)),
+    ?line true = (one_rb_lines([error]) > 1),
+    ?line true = (one_rb_lines([error_report]) > 1),
+    ?line 1 = one_rb_findstr([error],pid_to_list(Self)),
+    ?line 1 = one_rb_findstr([error_report],pid_to_list(Self)),
     ?line 2 = one_rb_findstr([],pid_to_list(Self)),
     ?line true = (one_rb_findstr([progress],"===") > 4),
     ?line rb:stop(),
@@ -407,9 +403,9 @@ rb_warnings_info() ->
     ?line stop_node(Node),
     ok.
 
-rb_warnings_errors() ->
+rb_warnings_warnings() ->
     ?line clean_rd(),
-    ?line Node = start_node(nn(),"+W e -boot start_sasl -sasl error_logger_mf_dir "++
+    ?line Node = start_node(nn(),"+W w -boot start_sasl -sasl error_logger_mf_dir "++
 		      quote(rd())++" error_logger_mf_maxbytes 5000 "
 		      "error_logger_mf_maxfiles 5"),
     ?line Self = self(),
@@ -423,10 +419,10 @@ rb_warnings_errors() ->
     ?line rb:list(),
     ?line true = (one_rb_lines([error]) =:= 0),
     ?line true = (one_rb_lines([error_report]) =:= 0),
-    ?line 1 = one_rb_findstr([error],pid_to_list(Self)),
-    ?line 1 = one_rb_findstr([error_report],pid_to_list(Self)),
-    ?line 0 = one_rb_findstr([warning_msg],pid_to_list(Self)),
-    ?line 0 = one_rb_findstr([warning_report],pid_to_list(Self)),
+    ?line 0 = one_rb_findstr([error],pid_to_list(Self)),
+    ?line 0 = one_rb_findstr([error_report],pid_to_list(Self)),
+    ?line 1 = one_rb_findstr([warning_msg],pid_to_list(Self)),
+    ?line 1 = one_rb_findstr([warning_report],pid_to_list(Self)),
     ?line 0 = one_rb_findstr([info_msg],pid_to_list(Self)),
     ?line 0 = one_rb_findstr([info_report],pid_to_list(Self)),
     ?line 2 = one_rb_findstr([],pid_to_list(Self)),
@@ -438,7 +434,7 @@ rb_warnings_errors() ->
 
 rb_trunc() ->
     ?line clean_rd(),
-    ?line Node = start_node(nn(),"-boot start_sasl -sasl error_logger_mf_dir "++
+    ?line Node = start_node(nn(),"+W w -boot start_sasl -sasl error_logger_mf_dir "++
 		      quote(rd())++" error_logger_mf_maxbytes 5000 "
 		      "error_logger_mf_maxfiles 5"),
     ?line Self = self(),
@@ -471,7 +467,7 @@ rb_trunc() ->
 
 rb_utc() ->
     ?line clean_rd(),
-    ?line Node = start_node(nn(),"-boot start_sasl -sasl error_logger_mf_dir "++
+    ?line Node = start_node(nn(),"+W w -boot start_sasl -sasl error_logger_mf_dir "++
 		      quote(rd())++" error_logger_mf_maxbytes 5000 "
 		      "error_logger_mf_maxfiles 5 -sasl utc_log true"),
     ?line Self = self(),
@@ -504,7 +500,7 @@ rb_utc() ->
     
 file_utc() ->
     ?line file:delete(lf()),
-    ?line SS="-stdlib utc_log true -kernel error_logger "++ oquote("{file,"++iquote(lf())++"}"),
+    ?line SS="+W w -stdlib utc_log true -kernel error_logger "++ oquote("{file,"++iquote(lf())++"}"),
     %erlang:display(SS),
     ?line Node = start_node(nn(),SS),
     %erlang:display(rpc:call(Node,application,get_env,[kernel,error_logger])),