From fe5acb20f160aed85dcc3e9cc7236359413134bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= <essen@ninenines.eu>
Date: Wed, 22 Jul 2015 23:05:49 +0200
Subject: Add autobahn test suite output to the console

---
 ebin/cowboy.app   |  2 +-
 test/ws_SUITE.erl | 21 +++++++++++++++++----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/ebin/cowboy.app b/ebin/cowboy.app
index da617e1..2db5efc 100644
--- a/ebin/cowboy.app
+++ b/ebin/cowboy.app
@@ -1 +1 @@
-{application, cowboy, [ {description, "Small, fast, modular HTTP server."}, {vsn, "2.0.0-pre.2"}, {id, "2.0.0-pre.2-2-gd64aba4-dirty"}, {modules, [cowboy,cowboy_app,cowboy_bstr,cowboy_clock,cowboy_constraints,cowboy_handler,cowboy_http2,cowboy_loop,cowboy_middleware,cowboy_protocol,cowboy_req,cowboy_rest,cowboy_router,cowboy_spdy,cowboy_static,cowboy_stream,cowboy_stream_h,cowboy_sub_protocol,cowboy_sup,cowboy_tls,cowboy_websocket]}, {registered, [cowboy_sup,cowboy_clock]}, {applications, [kernel,stdlib,crypto,cowlib,ranch]}, {mod, {cowboy_app, []}}]}.
+{application, cowboy, [ {description, "Small, fast, modular HTTP server."}, {vsn, "2.0.0-pre.2"}, {id, "2.0.0-pre.2-10-g93d1e0c-dirty"}, {modules, [cowboy,cowboy_app,cowboy_bstr,cowboy_clock,cowboy_constraints,cowboy_handler,cowboy_http2,cowboy_loop,cowboy_middleware,cowboy_protocol,cowboy_req,cowboy_rest,cowboy_router,cowboy_spdy,cowboy_static,cowboy_stream,cowboy_stream_h,cowboy_sub_protocol,cowboy_sup,cowboy_tls,cowboy_websocket]}, {registered, [cowboy_sup,cowboy_clock]}, {applications, [kernel,stdlib,crypto,cowlib,ranch]}, {mod, {cowboy_app, []}}]}.
diff --git a/test/ws_SUITE.erl b/test/ws_SUITE.erl
index 9cafd3c..79614ad 100644
--- a/test/ws_SUITE.erl
+++ b/test/ws_SUITE.erl
@@ -86,19 +86,32 @@ init_dispatch() ->
 %% Tests.
 
 autobahn_fuzzingclient(Config) ->
-	Out = os:cmd("cd " ++ config(priv_dir, Config)
-		++ " && wstest -m fuzzingclient -s "
-		++ config(data_dir, Config) ++ "client.json"),
+	Self = self(),
+	spawn_link(fun() -> start_port(Config, Self) end),
+	receive autobahn_exit -> ok end,
 	Report = config(priv_dir, Config) ++ "reports/servers/index.html",
 	ct:log("<h2><a href=\"~s\">Full report</a></h2>~n", [Report]),
 	ct:print("Autobahn Test Suite report: file://~s~n", [Report]),
-	ct:log("~s~n", [Out]),
 	{ok, HTML} = file:read_file(Report),
 	case length(binary:matches(HTML, <<"case_failed">>)) > 2 of
 		true -> error(failed);
 		false -> ok
 	end.
 
+start_port(Config, Pid) ->
+	Port = open_port({spawn, "wstest -m fuzzingclient -s " ++ config(data_dir, Config) ++ "client.json"},
+		[{line, 10000}, {cd, config(priv_dir, Config)}, binary, eof]),
+	receive_infinity(Port, Pid).
+
+receive_infinity(Port, Pid) ->
+	receive
+		{Port, {data, {eol, Line}}} ->
+			io:format(user, "~s~n", [Line]),
+			receive_infinity(Port, Pid);
+		{Port, eof} ->
+			Pid ! autobahn_exit
+	end.
+
 %% We do not support hixie76 anymore.
 ws0(Config) ->
 	{port, Port} = lists:keyfind(port, 1, Config),
-- 
cgit v1.2.3