4 files changed, 18 insertions, 87 deletions
diff --git a/lib/compiler/test/compile_SUITE.erl b/lib/compiler/test/compile_SUITE.erl
index b68d039681..ab9910f555 100644
--- a/lib/compiler/test/compile_SUITE.erl
+++ b/lib/compiler/test/compile_SUITE.erl
@@ -29,7 +29,7 @@
 	 file_1/1, forms_2/1, module_mismatch/1, big_file/1, outdir/1,
 	 binary/1, makedep/1, cond_and_ifdef/1, listings/1, listings_big/1,
 	 other_output/1, encrypted_abstr/1,
-	 bad_record_use1/1, bad_record_use2/1, strict_record/1,
+	 strict_record/1,
 	 missing_testheap/1, cover/1, env/1, core/1, asm/1,
 	 sys_pre_attributes/1, dialyzer/1,
 	 warnings/1
@@ -48,13 +48,12 @@ all() ->
     [app_test, appup_test, file_1, forms_2, module_mismatch, big_file, outdir,
      binary, makedep, cond_and_ifdef, listings, listings_big,
      other_output, encrypted_abstr,
-     {group, bad_record_use}, strict_record,
+     strict_record,
      missing_testheap, cover, env, core, asm,
      sys_pre_attributes, dialyzer, warnings].
 
 groups() -> 
-    [{bad_record_use, [],
-      [bad_record_use1, bad_record_use2]}].
+    [].
 
 init_per_suite(Config) ->
     Config.
@@ -599,28 +598,6 @@ exists(Name) ->
     end.
 
 
-%% Tests that the compiler does not accept
-%% bad use of records.
-bad_record_use1(Config) when is_list(Config) ->
-    ?line {ok, Cwd} = file:get_cwd(),
-    ?line file:set_cwd(?config(data_dir, Config)),
-    ?line true=exists("bad_record_use.erl"),
-    ?line Ret=c:c(bad_record_use),
-    ?line file:set_cwd(Cwd),
-    ?line error=Ret,
-    ok.
-
-%% Tests that the compiler does not accept
-%% bad use of records.
-bad_record_use2(Config) when is_list(Config) ->
-    ?line {ok, Cwd} = file:get_cwd(),
-    ?line file:set_cwd(?config(data_dir, Config)),
-    ?line true=exists("bad_record_use2.erl"),
-    ?line Ret=c:c(bad_record_use),
-    ?line file:set_cwd(Cwd),
-    ?line error=Ret,
-    ok.
-
 strict_record(Config) when is_list(Config) ->
     ?line Priv = ?config(priv_dir, Config),
     ?line file:set_cwd(?config(data_dir, Config)),
diff --git a/lib/compiler/test/compile_SUITE_data/bad_record_use.erl b/lib/compiler/test/compile_SUITE_data/bad_record_use.erl
deleted file mode 100644
index 0fb6fc3045..0000000000
--- a/lib/compiler/test/compile_SUITE_data/bad_record_use.erl
+++ /dev/null
@@ -1,29 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1998-2009. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
--module(bad_record_use).
--export([test/0]).
-
--record(bad_use, {a=undefined,
-		  b=undefined,
-		  c=undefined}).
-
-test() ->
-    NewRecord=#bad_use{a=1, b=2, a=2}.
-
diff --git a/lib/compiler/test/compile_SUITE_data/bad_record_use2.erl b/lib/compiler/test/compile_SUITE_data/bad_record_use2.erl
deleted file mode 100644
index 7c898af00f..0000000000
--- a/lib/compiler/test/compile_SUITE_data/bad_record_use2.erl
+++ /dev/null
@@ -1,30 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1998-2009. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
--module(bad_record_use2).
--export([test/0]).
-
--record(bad_use, {a=undefined,
-		  b=undefined,
-		  c=undefined}).
-
-test() ->
-    R=#bad_use{a=1, b=2},
-    R2=R#bad_use{a=1, b=2, a=2},
-    ok.
diff --git a/lib/stdlib/test/erl_lint_SUITE.erl b/lib/stdlib/test/erl_lint_SUITE.erl
index c5e2e5609d..32247ba492 100644
--- a/lib/stdlib/test/erl_lint_SUITE.erl
+++ b/lib/stdlib/test/erl_lint_SUITE.erl
@@ -65,7 +65,8 @@
 	  too_many_arguments/1,
 	  basic_errors/1,bin_syntax_errors/1,
           predef/1,
-          maps/1,maps_type/1,otp_11851/1,otp_11879/1,otp_13230/1
+          maps/1,maps_type/1,otp_11851/1,otp_11879/1,otp_13230/1,
+	  record_errors/1
         ]).
 
 % Default timetrap timeout (set in init_per_testcase).
@@ -94,7 +95,8 @@ all() ->
      bif_clash, behaviour_basic, behaviour_multiple, otp_11861,
      otp_7550, otp_8051, format_warn, {group, on_load},
      too_many_arguments, basic_errors, bin_syntax_errors, predef,
-     maps, maps_type, otp_11851, otp_11879, otp_13230].
+     maps, maps_type, otp_11851, otp_11879, otp_13230,
+     record_errors].
 
 groups() -> 
     [{unused_vars_warn, [],
@@ -3881,6 +3883,17 @@ otp_13230(Config) when is_list(Config) ->
      []} = run_test2(Config, Abstr, []),
     ok.
 
+record_errors(Config) when is_list(Config) ->
+    Ts = [{rec1,
+           <<"-record(r, {a,b}).
+              b() -> #r{a=foo,b=42,a=bar}.
+              u(R) -> R#r{a=1,b=2,a=2}.
+             ">>,
+           [],
+           {errors,[{2,erl_lint,{redefine_field,r,a}},
+		    {3,erl_lint,{redefine_field,r,a}}],[]}}],
+    run(Config, Ts).
+
 run(Config, Tests) ->
     F = fun({N,P,Ws,E}, BadL) ->
                 case catch run_test(Config, P, Ws) of