Merge remote branch 'origin/peppe/common_test/otp-9933' into maint

* origin/peppe/common_test/otp-9933:
  Correct wrong location printout for ct:fail/1/2

OTP-9933

1 files changed, 20 insertions, 4 deletions

diff --git a/lib/common_test/src/ct.erl b/lib/common_test/src/ct.erl
index e0e82283c4..00701f5a2d 100644
--- a/lib/common_test/src/ct.erl
+++ b/lib/common_test/src/ct.erl
@@ -585,8 +585,16 @@ capture_get([]) ->
 %%% @doc Terminate a test case with the given error
 %%% <code>Reason</code>.
 fail(Reason) ->
-    exit({test_case_failed,Reason}).
-
+    try
+	exit({test_case_failed,Reason})
+    catch
+	Class:R ->
+	    case erlang:get_stacktrace() of
+		[{?MODULE,fail,1,_}|Stk] -> ok;
+		Stk -> ok
+	    end,
+	    erlang:raise(Class, R, Stk)
+    end.
 
 %%%-----------------------------------------------------------------
 %%% @spec fail(Format, Args) -> void()
@@ -599,13 +607,21 @@ fail(Reason) ->
 fail(Format, Args) ->
     try io_lib:format(Format, Args) of
 	Str ->
-	    exit({test_case_failed,lists:flatten(Str)})
+	    try
+		exit({test_case_failed,lists:flatten(Str)})
+	    catch
+		Class:R ->
+		    case erlang:get_stacktrace() of
+			[{?MODULE,fail,2,_}|Stk] -> ok;
+			Stk -> ok
+		    end,
+		    erlang:raise(Class, R, Stk)
+	    end
     catch
 	_:BadArgs ->
 	    exit({BadArgs,{?MODULE,fail,[Format,Args]}})
     end.
 
-
 %%%-----------------------------------------------------------------
 %%% @spec comment(Comment) -> void()
 %%%      Comment = term()