From 9af03334bc3c48798c28d6ead4a02cb1bcd3fe30 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Tue, 5 Apr 2016 16:36:18 +0200
Subject: ts: Add logging of exit_status from test node

---
 lib/common_test/test_server/ts_run.erl | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/common_test/test_server/ts_run.erl b/lib/common_test/test_server/ts_run.erl
index 188094921d..844f4b2abe 100644
--- a/lib/common_test/test_server/ts_run.erl
+++ b/lib/common_test/test_server/ts_run.erl
@@ -261,7 +261,7 @@ run_batch(Vars, _Spec, State) ->
     Command = State#state.command ++ " -noinput -s erlang halt",
     ts_lib:progress(Vars, 1, "Command: ~ts~n", [Command]),
     io:format(user, "Command: ~ts~n",[Command]),
-    Port = open_port({spawn, Command}, [stream, in, eof]),
+    Port = open_port({spawn, Command}, [stream, in, eof, exit_status]),
     Timeout = 30000 * case os:getenv("TS_RUN_VALGRIND") of
 			  false -> 1;
 			  _ -> 100
@@ -284,7 +284,16 @@ tricky_print_data(Port, Timeout) ->
 		    ok
 	    after 1 ->				% force context switch
 		    ok
-	    end
+	    end,
+            receive
+                {Port, {exit_status, 0}} ->
+                    ok;
+                {Port, {exit_status, N}} ->
+                    io:format(user, "Test run exited with status ~p~n", [N])
+            after 1 ->
+                    %% This shouldn't happen, but better safe then hanging
+                    ok
+            end
     after Timeout ->
 	    case erl_epmd:names() of
 		{ok,Names} ->
-- 
cgit v1.2.3