From 221055de07c793f2e037816ad3e2c336b1b2dd92 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Fri, 20 May 2016 10:37:50 +0200
Subject: ssh: split result line in test

---
 lib/ssh/test/ssh_algorithms_SUITE.erl | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'lib')

diff --git a/lib/ssh/test/ssh_algorithms_SUITE.erl b/lib/ssh/test/ssh_algorithms_SUITE.erl
index 826555f6ab..95fe23a461 100644
--- a/lib/ssh/test/ssh_algorithms_SUITE.erl
+++ b/lib/ssh/test/ssh_algorithms_SUITE.erl
@@ -259,15 +259,17 @@ sshc_simple_exec_os_cmd(Config) ->
 					   " ",Host," 1+1."]),
 		       Result = os:cmd(Cmd),
 		       ct:log("~p~n  = ~p",[Cmd, Result]),
-		       Parent ! {result, self(), Result, "2\n"}
+		       Parent ! {result, self(), Result, "2"}
 	       end),
     receive
-	{result, Client, Result, Expect} ->
-	    case Result of
-		Expect ->
+	{result, Client, RawResult, Expect} ->
+	    Lines = string:tokens(RawResult, "\r\n"),
+	    case lists:any(fun(Line) -> Line==Expect end,
+			   Lines) of
+		true ->
 		    ok;
-		_ ->
-		    ct:log("Bad result: ~p~nExpected: ~p", [Result,Expect]),
+		false ->
+		    ct:log("Bad result: ~p~nExpected: ~p~nMangled result: ~p", [RawResult,Expect,Lines]),
 		    {fail, "Bad result"}
 	    end
     after ?TIMEOUT ->
-- 
cgit v1.2.3