From aa1e961f4dc6250f1ccbfbf150cae8dbef1503e9 Mon Sep 17 00:00:00 2001
From: Dan Gudmundsson <dgud@erlang.org>
Date: Mon, 8 Dec 2014 09:40:59 +0100
Subject: debugger: Do not use the old removed gs functionality

dbg_ui_trace module was invoked even though the module had been removed.
---
 lib/debugger/doc/src/i.xml      | 2 +-
 lib/debugger/doc/src/int.xml    | 2 +-
 lib/debugger/src/dbg_wx_mon.erl | 2 +-
 lib/debugger/src/i.erl          | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/debugger/doc/src/i.xml b/lib/debugger/doc/src/i.xml
index fb7641c30e..7564da79b3 100644
--- a/lib/debugger/doc/src/i.xml
+++ b/lib/debugger/doc/src/i.xml
@@ -211,7 +211,7 @@
 	  the result of calling the shell function <c>pid(X,Y,Z)</c>.
 	  An attached process is expected to call the unofficial
 	  <c>int:attached(Pid)</c> function and to be able to handle
-	  messages from the interpreter, see <c>dbg_ui_trace.erl</c> for
+	  messages from the interpreter, see <c>dbg_wx_trace.erl</c> for
 	  an example.</p>
       </desc>
     </func>
diff --git a/lib/debugger/doc/src/int.xml b/lib/debugger/doc/src/int.xml
index 3a5886ceb9..96d0d7f83d 100644
--- a/lib/debugger/doc/src/int.xml
+++ b/lib/debugger/doc/src/int.xml
@@ -49,7 +49,7 @@
       execution. This is done by sending and receiving information
       to/from the process via a third process, called the meta process.
       It is possible to implement your own attached process. See
-      <c>int.erl</c> for available functions and <c>dbg_ui_trace.erl</c>
+      <c>int.erl</c> for available functions and <c>dbg_wx_trace.erl</c>
       for possible messages.</p>
 
     <p>The interpreter depends on the Kernel, STDLIB and GS
diff --git a/lib/debugger/src/dbg_wx_mon.erl b/lib/debugger/src/dbg_wx_mon.erl
index 4ab03985d3..aed86f5232 100644
--- a/lib/debugger/src/dbg_wx_mon.erl
+++ b/lib/debugger/src/dbg_wx_mon.erl
@@ -414,7 +414,7 @@ gui_cmd({'Trace Window', TraceWin}, State) ->
     State2 = State#state{tracewin=TraceWin},
     case State#state.attach of
 	false -> ignore;
-	{Flags, {dbg_ui_trace, start, StartFlags}} ->
+	{Flags, {dbg_wx_trace, start, StartFlags}} ->
 	    case trace_function(State2) of
 		{_, _, StartFlags} -> ignore;
 		NewFunction -> % {_, _, NewStartFlags}
diff --git a/lib/debugger/src/i.erl b/lib/debugger/src/i.erl
index 5805501524..0afb998097 100644
--- a/lib/debugger/src/i.erl
+++ b/lib/debugger/src/i.erl
@@ -250,7 +250,7 @@ ist(Flag) ->
 %% -------------------------------------------
 
 iaa(Flag) ->
-    iaa(Flag,{dbg_ui_trace,start,[]}).
+    iaa(Flag,{dbg_wx_trace,start,[]}).
 
 %% -------------------------------------------
 %% Set the automatic attachment flag.
@@ -271,7 +271,7 @@ iaa(Flag,Fnk) ->
 %% -------------------------------------------
 
 ia(Pid) ->
-    ia(Pid,{dbg_ui_trace,start}).
+    ia(Pid,{dbg_wx_trace,start}).
 
 %% -------------------------------------------
 %% Attach to process.
-- 
cgit v1.2.3


From 89f5c0d57132d4513c715f6e3d5e116b9a544c8f Mon Sep 17 00:00:00 2001
From: Marcus Arendt <marcus@erlang.org>
Date: Tue, 9 Dec 2014 10:27:28 +0100
Subject: revert ssh testcase

---
 lib/ssh/test/ssh_connection_SUITE.erl | 27 +--------------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

diff --git a/lib/ssh/test/ssh_connection_SUITE.erl b/lib/ssh/test/ssh_connection_SUITE.erl
index 553d0f5720..85bd2c75d4 100644
--- a/lib/ssh/test/ssh_connection_SUITE.erl
+++ b/lib/ssh/test/ssh_connection_SUITE.erl
@@ -37,7 +37,7 @@
 all() ->
     [
      {group, openssh},
-     start_subsystem_on_closed_channel,
+     {group, openssh_payload},
      interrupted_send,
      start_shell,
      start_shell_exec,
@@ -286,32 +286,7 @@ ptty_alloc_pixel(Config) when is_list(Config) ->
     ssh:close(ConnectionRef).
 
 %%--------------------------------------------------------------------
-start_subsystem_on_closed_channel(Config) ->
-    PrivDir = ?config(priv_dir, Config),
-    UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
-    file:make_dir(UserDir),
-    SysDir = ?config(data_dir, Config),
-    {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SysDir},
-					     {user_dir, UserDir},
-					     {password, "morot"},
-					     {subsystems, [{"echo_n", {ssh_echo_server, [4000000]}}]}]),
-
-    ConnectionRef = ssh_test_lib:connect(Host, Port, [{silently_accept_hosts, true},
-						      {user, "foo"},
-						      {password, "morot"},
-						      {user_interaction, false},
-						      {user_dir, UserDir}]),
-
-    {ok, ChannelId} = ssh_connection:session_channel(ConnectionRef, infinity),
-
-    ok = ssh_connection:close(ConnectionRef, ChannelId),
 
-    failure = ssh_connection:subsystem(ConnectionRef, ChannelId, "echo_n", infinity),
-
-    ssh:close(ConnectionRef),
-    ssh:stop_daemon(Pid).
-
-%%--------------------------------------------------------------------
 interrupted_send() ->
     [{doc, "Use a subsystem that echos n char and then sends eof to cause a channel exit partway through a large send."}].
 
-- 
cgit v1.2.3