Merge branch 'maint'

3 files changed, 39 insertions, 94 deletions

diff --git a/lib/common_test/src/ct_telnet.erl b/lib/common_test/src/ct_telnet.erl
index 02186864a5..beb3c1d649 100644
--- a/lib/common_test/src/ct_telnet.erl
+++ b/lib/common_test/src/ct_telnet.erl
@@ -728,7 +728,8 @@ teln_get_all_data(Pid,Prx,Data,Acc,LastLine) ->
 	    haltpatterns=[],
 	    seq=false,
 	    repeat=false,
-	    found_prompt=false}).
+	    found_prompt=false,
+	    wait_for_linebreak=true}).
 
 %% @hidden
 %% @doc Externally the silent_teln_expect function shall only be used
@@ -754,20 +755,25 @@ silent_teln_expect(Pid,Data,Pattern,Prx,Opts) ->
 %% condition is fullfilled.
 %% 3b) Repeat (sequence): 2) is repeated either N times or until a
 %% halt condition is fullfilled.
-teln_expect(Pid,Data,Pattern0,Prx,Opts) -> HaltPatterns = case
-    get_ignore_prompt(Opts) of true -> get_haltpatterns(Opts); false
-    -> [prompt | get_haltpatterns(Opts)] end,
-
+teln_expect(Pid,Data,Pattern0,Prx,Opts) -> 
+    HaltPatterns = case get_ignore_prompt(Opts) of 
+		       true -> 
+			   get_haltpatterns(Opts); 
+		       false -> 
+			   [prompt | get_haltpatterns(Opts)] 
+		   end,
+    WaitForLineBreak = get_line_break_opt(Opts),
     Seq = get_seq(Opts),
     Pattern = convert_pattern(Pattern0,Seq),
-
+					   
     Timeout = get_timeout(Opts),
- 
+					   
     EO = #eo{teln_pid=Pid,
 	     prx=Prx,
 	     timeout=Timeout,
 	     seq=Seq,
-	     haltpatterns=HaltPatterns},
+	     haltpatterns=HaltPatterns,
+	     wait_for_linebreak=WaitForLineBreak},
     
     case get_repeat(Opts) of
 	false ->
@@ -808,6 +814,11 @@ get_timeout(Opts) ->
 	{value,{timeout,T}} -> T;
 	false -> ?DEFAULT_TIMEOUT
     end.
+get_line_break_opt(Opts) ->
+    case lists:keysearch(wait_for_linebreak,1,Opts) of
+	{value,{wait_for_linebreak,false}} -> false;
+	_ -> true
+    end.
 get_repeat(Opts) ->
     case lists:keysearch(repeat,1,Opts) of
 	{value,{repeat,N}} when is_integer(N) ->
@@ -1004,8 +1015,9 @@ seq_expect1(Data,[],Acc,Rest,_EO) ->
 %% Split prompt-chunk at lines
 match_lines(Data,Patterns,EO) ->
     FoundPrompt = EO#eo.found_prompt,
+    NeedLineBreak = EO#eo.wait_for_linebreak,
     case one_line(Data,[]) of
-	{noline,Rest} when FoundPrompt=/=false ->
+	{noline,Rest} when FoundPrompt=/=false, NeedLineBreak =:= true ->
 	    %% This is the line including the prompt
 	    case match_line(Rest,Patterns,FoundPrompt,EO) of
 		nomatch ->
@@ -1013,7 +1025,14 @@ match_lines(Data,Patterns,EO) ->
 		{Tag,Match} ->
 		    {Tag,Match,[]}
 	    end;
-	{noline,Rest} ->
+	{noline,Rest} when NeedLineBreak =:= false ->
+	    case match_line(Rest,Patterns,FoundPrompt,EO) of
+		nomatch ->
+		    {nomatch,prompt};
+		{Tag,Match} ->
+		    {Tag,Match,[]}
+	    end;
+	{noline, Rest} ->
 	    {nomatch,Rest};
 	{Line,Rest} ->
 	    case match_line(Line,Patterns,false,EO) of
diff --git a/lib/stdlib/test/dets_SUITE.erl b/lib/stdlib/test/dets_SUITE.erl
index 065b74ad41..8ff7c3ccc9 100644
--- a/lib/stdlib/test/dets_SUITE.erl
+++ b/lib/stdlib/test/dets_SUITE.erl
@@ -33,8 +33,6 @@
 -define(datadir(Conf), ?config(data_dir, Conf)).
 -endif.
 
--compile(r13). % OTP-9607
-
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2, 
 	 newly_started/1, basic_v8/1, basic_v9/1,
@@ -54,7 +52,7 @@
          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_8923/1, otp_9282/1, otp_9607/1]).
+         otp_8923/1, otp_9282/1]).
 
 -export([dets_dirty_loop/0]).
 
@@ -111,7 +109,7 @@ all() ->
 	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_8923, otp_9282, otp_9607
+	otp_8899, otp_8903, otp_8923, otp_9282
     ].
 
 groups() -> 
@@ -3899,77 +3897,6 @@ some_calls(Tab, Config) ->
     ok = dets:close(T),
     file:delete(File).
 
-otp_9607(doc) ->
-    ["OTP-9607. Test downgrading the slightly changed format."];
-otp_9607(suite) ->
-    [];
-otp_9607(Config) when is_list(Config) ->
-    %% Note: the bug is about almost full tables. The fix of that
-    %% problem is *not* tested here.
-    Version = r13b,
-    case ?t:is_release_available(atom_to_list(Version)) of
-        true ->
-            T = otp_9607,
-            File = filename(T, Config),
-            Key = a,
-            Value = 1,
-            Args = [{file,File}],
-            {ok, T} = dets:open_file(T, Args),
-            ok = dets:insert(T, {Key, Value}),
-            ok = dets:close(T),
-
-            Call = fun(P, A) ->
-                           P ! {self(), A},
-                           receive
-                               {P, Ans} ->
-                                   Ans
-                           after 5000 ->
-                                   exit(other_process_dead)
-                           end
-                   end,
-            %% Create a file on the modified format, read the file
-            %% with an emulator that doesn't know about the modified
-            %% format.
-            {ok, Node} = start_node_rel(Version, Version, slave),
-            Pid = rpc:call(Node, erlang, spawn,
-                           [?MODULE, dets_dirty_loop, []]),
-            {error,{needs_repair, File}} =
-                Call(Pid, [open, T, Args++[{repair,false}]]),
-            io:format("Expect repair:~n"),
-            {ok, T} = Call(Pid, [open, T, Args]),
-            [{Key,Value}] = Call(Pid, [read, T, Key]),
-            ok = Call(Pid, [close, T]),
-            file:delete(File),
-
-            %% Create a file on the unmodified format. Modify the file
-            %% using an emulator that must not turn the file into the
-            %% modified format. Read the file and make sure it is not
-            %% repaired.
-            {ok, T} = Call(Pid, [open, T, Args]),
-            ok = Call(Pid, [write, T, {Key,Value}]),
-            [{Key,Value}] = Call(Pid, [read, T, Key]),
-            ok = Call(Pid, [close, T]),
-
-            Key2 = b,
-            Value2 = 2,
-
-            {ok, T} = dets:open_file(T, Args),
-            [{Key,Value}] = dets:lookup(T, Key),
-            ok = dets:insert(T, {Key2,Value2}),
-            ok = dets:close(T),
-
-            {ok, T} = Call(Pid, [open, T, Args++[{repair,false}]]),
-            [{Key2,Value2}] = Call(Pid, [read, T, Key2]),
-            ok = Call(Pid, [close, T]),
-
-            ?t:stop_node(Node),
-            file:delete(File),
-            ok;
-        false ->
-	    {skipped, "No support for old node"}
-    end.
-
-
 
 %%
 %% Parts common to several test cases
diff --git a/lib/stdlib/test/ets_SUITE.erl b/lib/stdlib/test/ets_SUITE.erl
index d40609eeb0..af5d5a8f21 100644
--- a/lib/stdlib/test/ets_SUITE.erl
+++ b/lib/stdlib/test/ets_SUITE.erl
@@ -3268,15 +3268,14 @@ delete_large_named_table_1(Name, Flags, Data, Fix) ->
     end,
     Parent = self(),
     {Pid, MRef} = my_spawn_opt(fun() ->
-				       receive
-					   {trace,Parent,call,_} ->
-					       ets_new(Name, [named_table])
-				       end
-			       end, [link, monitor]),
-    ?line erlang:trace(self(), true, [call,{tracer,Pid}]),
-    ?line erlang:trace_pattern({ets,delete,1}, true, [global]),
-    ?line erlang:yield(), true = ets:delete(Tab),
-    ?line erlang:trace_pattern({ets,delete,1}, false, [global]),
+				      receive
+					  ets_new ->
+					      ets_new(Name, [named_table])				      
+				      end
+			       end,
+			       [link, monitor]),
+    true = ets:delete(Tab),
+    Pid ! ets_new,
     receive {'DOWN',MRef,process,Pid,_} -> ok end,
     ok.