From d64fa0f13cd07b48291d1ab3b843c411aaf8451d Mon Sep 17 00:00:00 2001
From: Siri Hansen <siri@erlang.org>
Date: Wed, 25 Jan 2017 10:37:11 +0100
Subject: [ct] Fix function_clause in ct_framework when hook function crashes

If CtHook:pre_init_per_testcase(...,end_per_testcase,...) failed, then
the ct_framework:end_tc would fail with function_clause. This is now
corrected.
---
 lib/common_test/src/test_server.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/common_test/src/test_server.erl b/lib/common_test/src/test_server.erl
index 924086f2bd..0787a323f3 100644
--- a/lib/common_test/src/test_server.erl
+++ b/lib/common_test/src/test_server.erl
@@ -1156,7 +1156,7 @@ do_end_tc_call(Mod, IPTC={init_per_testcase,Func}, Res, Return) ->
 		     {ok,EPTCInitConfig} when is_list(EPTCInitConfig) ->
 			 {Return,EPTCInitConfig};
 		     _ ->
-			 Return
+                         {Return,IPTCEndRes}
 		 end,
 	     do_end_tc_call1(Mod, {end_per_testcase,Func},
 			     EPTCInitRes, Return);
-- 
cgit v1.2.3