3 files changed, 76 insertions, 6 deletions

diff --git a/lib/stdlib/test/dets_SUITE.erl b/lib/stdlib/test/dets_SUITE.erl
index a1f70dc27d..8b18ef5664 100644
--- a/lib/stdlib/test/dets_SUITE.erl
+++ b/lib/stdlib/test/dets_SUITE.erl
@@ -50,7 +50,8 @@
 	 otp_4208/1, otp_4989/1, many_clients/1, otp_4906/1, otp_5402/1,
          simultaneous_open/1, insert_new/1, repair_continuation/1,
          otp_5487/1, otp_6206/1, otp_6359/1, otp_4738/1, otp_7146/1,
-         otp_8070/1, otp_8856/1, otp_8898/1, otp_8899/1, otp_8903/1]).
+         otp_8070/1, otp_8856/1, otp_8898/1, otp_8899/1, otp_8903/1,
+         otp_8923/1]).
 
 -export([dets_dirty_loop/0]).
 
@@ -108,7 +109,8 @@ all(suite) ->
 	      cache_duplicate_bags_v9, otp_4208, otp_4989, many_clients,
               otp_4906, otp_5402, simultaneous_open, insert_new, 
               repair_continuation, otp_5487, otp_6206, otp_6359, otp_4738,
-              otp_7146, otp_8070, otp_8856, otp_8898, otp_8899, otp_8903]}
+              otp_7146, otp_8070, otp_8856, otp_8898, otp_8899, otp_8903,
+              otp_8923]}
     end.
 
 not_run(suite) -> [];
@@ -3805,6 +3807,39 @@ otp_8903(Config) when is_list(Config) ->
     file:delete(File),
     ok.
 
+otp_8923(doc) ->
+    ["OTP-8923. rehash due to lookup after initialization."];
+otp_8923(suite) ->
+    [];
+otp_8923(Config) when is_list(Config) ->
+    Tab = otp_8923,
+    File = filename(Tab, Config),
+    %% Create a file with more than 256 keys:
+    file:delete(File),
+    Bin = list_to_binary([ 0 || _ <- lists:seq(1, 400) ]),
+    BigBin = list_to_binary([ 0 ||_ <- lists:seq(1, 4000)]),
+    Ets = ets:new(temp, [{keypos,1}]),
+    ?line [ true = ets:insert(Ets, {C,Bin}) || C <- lists:seq(1, 700) ],
+    ?line true = ets:insert(Ets, {helper_data,BigBin}),
+    ?line true = ets:insert(Ets, {prim_btree,BigBin}),
+    ?line true = ets:insert(Ets, {sec_btree,BigBin}),
+    %% Note: too few slots; re-hash will take place
+    ?line {ok, Tab} = dets:open_file(Tab, [{file,File}]),
+    ?line Tab = ets:to_dets(Ets, Tab),
+    ?line ok = dets:close(Tab),
+    ?line true = ets:delete(Ets),
+    
+    ?line {ok,Ref} = dets:open_file(File),
+    ?line [{1,_}] = dets:lookup(Ref, 1),
+    ?line ok = dets:close(Ref),
+
+    ?line {ok,Ref2} = dets:open_file(File),
+    ?line [{helper_data,_}] = dets:lookup(Ref2, helper_data),
+    ?line ok = dets:close(Ref2),
+
+    file:delete(File),
+    ok.
+
 %%
 %% Parts common to several test cases
 %% 
diff --git a/lib/stdlib/test/epp_SUITE.erl b/lib/stdlib/test/epp_SUITE.erl
index e31dfdd764..e9fb932632 100644
--- a/lib/stdlib/test/epp_SUITE.erl
+++ b/lib/stdlib/test/epp_SUITE.erl
@@ -24,7 +24,7 @@
 	 variable/1, variable_1/1, otp_4870/1, otp_4871/1, otp_5362/1,
          pmod/1, not_circular/1, skip_header/1, otp_6277/1, otp_7702/1,
          otp_8130/1, overload_mac/1, otp_8388/1, otp_8470/1, otp_8503/1,
-         otp_8562/1, otp_8665/1]).
+         otp_8562/1, otp_8665/1, otp_8911/1]).
 
 -export([epp_parse_erl_form/2]).
 
@@ -64,7 +64,7 @@ all(doc) ->
 all(suite) ->
     [rec_1, upcase_mac, predef_mac, variable, otp_4870, otp_4871, otp_5362,
      pmod, not_circular, skip_header, otp_6277, otp_7702, otp_8130,
-     overload_mac, otp_8388, otp_8470, otp_8503, otp_8562, otp_8665].
+     overload_mac, otp_8388, otp_8470, otp_8503, otp_8562, otp_8665, otp_8911].
 
 rec_1(doc) ->
     ["Recursive macros hang or crash epp (OTP-1398)."];
@@ -1197,6 +1197,40 @@ otp_8562(Config) when is_list(Config) ->
     ?line [] = compile(Config, Cs),
     ok.
 
+otp_8911(doc) ->
+    ["OTP-8911. -file and file inclusion bug"];
+otp_8911(suite) ->
+    [];
+otp_8911(Config) when is_list(Config) ->
+    ?line {ok, CWD} = file:get_cwd(),
+    ?line ok = file:set_cwd(?config(priv_dir, Config)),
+
+    File = "i.erl",
+    Cont = <<"-module(i).
+              -compile(export_all).
+              -file(\"fil1\", 100).
+              -include(\"i1.erl\").
+              t() ->
+                  a.
+           ">>,
+    ?line ok = file:write_file(File, Cont),
+    Incl = <<"-file(\"fil2\", 35).
+              t1() ->
+                  b.
+           ">>,
+    File1 = "i1.erl",
+    ?line ok = file:write_file(File1, Incl),
+
+    ?line {ok, i} = cover:compile(File),
+    ?line a = i:t(),
+    ?line {ok,[{{i,6},1}]} = cover:analyse(i, calls, line),
+    ?line cover:stop(),
+
+    file:delete(File),
+    file:delete(File1),
+    ?line file:set_cwd(CWD),
+    ok.
+
 otp_8665(doc) ->
     ["OTP-8665. Bugfix premature end."];
 otp_8665(suite) ->
diff --git a/lib/stdlib/test/string_SUITE.erl b/lib/stdlib/test/string_SUITE.erl
index 3171b87c44..452e048dd7 100644
--- a/lib/stdlib/test/string_SUITE.erl
+++ b/lib/stdlib/test/string_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2010. 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
@@ -240,7 +240,8 @@ copies(Config) when is_list(Config) ->
     ?line "." = string:copies(".", 1),
     ?line 30 = length(string:copies("123", 10)),
     %% invalid arg type
-    ?line {'EXIT',_} = (catch string:chars("hej", -1)),
+    ?line {'EXIT',_} = (catch string:copies("hej", -1)),
+    ?line {'EXIT',_} = (catch string:copies("hej", 2.0)),
     ok.
 
 words(suite) ->