From d3a6ecb105706b66f1c0c6b8a515370df5e29bd3 Mon Sep 17 00:00:00 2001
From: Peter Andersson <peppe@erlang.org>
Date: Sat, 5 Jun 2010 18:35:37 +0200
Subject: Add support for executing pre-loaded suites (e.g. modules loaded as
 binaries)

Also fixed bug in test_server that calls end_per_testcase after test case timeout or abortion.
---
 lib/test_server/src/test_server.erl | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'lib/test_server')

diff --git a/lib/test_server/src/test_server.erl b/lib/test_server/src/test_server.erl
index b70ac08622..d6de907a1b 100644
--- a/lib/test_server/src/test_server.erl
+++ b/lib/test_server/src/test_server.erl
@@ -876,10 +876,19 @@ call_end_conf(Mod,Func,TCPid,TCExitReason,Loc,Conf,TVal) ->
     EndConfProc =
 	fun() ->
 		Supervisor = self(),
-		EndConfApply = fun() ->
-				       apply(Mod,end_per_testcase,[Func,Conf]),
-				       Supervisor ! {self(),end_conf}
-			       end,
+		EndConfApply =
+		    fun() ->
+			    case catch apply(Mod,end_per_testcase,[Func,Conf]) of
+				{'EXIT',Why} ->
+				    group_leader() ! {printout,12,
+						      "ERROR! ~p:end_per_testcase(~p, ~p)"
+						      " crashed!\n\tReason: ~p\n",
+						      [Mod,Func,Conf,Why]};
+				_ ->
+				    ok
+			    end,
+			    Supervisor ! {self(),end_conf}
+		       end,
 		Pid = spawn_link(EndConfApply),
 		receive
 		    {Pid,end_conf} ->
-- 
cgit v1.2.3