From 319d7259672037e6999d7cdd0b469fbb5cadcf22 Mon Sep 17 00:00:00 2001
From: Peter Andersson <peppe@erlang.org>
Date: Tue, 6 Mar 2012 11:46:00 +0100
Subject: Correct wrong location printout for ct:fail/1/2

OTP-9933
---
 lib/common_test/src/ct.erl              | 24 +++++++++++---
 lib/common_test/test/ct_error_SUITE.erl | 56 ++++++++++++++++++++++++++++++++-
 2 files changed, 75 insertions(+), 5 deletions(-)

(limited to 'lib/common_test')

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()
diff --git a/lib/common_test/test/ct_error_SUITE.erl b/lib/common_test/test/ct_error_SUITE.erl
index 484b0aac0c..bd218dc05f 100644
--- a/lib/common_test/test/ct_error_SUITE.erl
+++ b/lib/common_test/test/ct_error_SUITE.erl
@@ -61,7 +61,7 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 all() -> 
     [cfg_error, lib_error, no_compile, timetrap_end_conf,
      timetrap_normal, timetrap_extended, timetrap_parallel,
-     timetrap_fun].
+     timetrap_fun, misc_errors].
 
 groups() -> 
     [].
@@ -249,6 +249,24 @@ timetrap_fun(Config) when is_list(Config) ->
     TestEvents = events_to_check(timetrap_fun),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).
 
+%%%-----------------------------------------------------------------
+%%%
+misc_errors(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    Join = fun(D, S) -> filename:join(D, "error/test/"++S) end,
+    Suites = [Join(DataDir, "misc_error_1_SUITE")],
+    {Opts,ERPid} = setup([{suite,Suites}], Config),
+    ok = ct_test_support:run(Opts, Config),
+    Events = ct_test_support:get_events(ERPid, Config),
+
+    ct_test_support:log_events(misc_errors,
+			       reformat(Events, ?eh),
+			       ?config(priv_dir, Config),
+			       Opts),
+
+    TestEvents = events_to_check(misc_errors),
+    ok = ct_test_support:verify_events(TestEvents, Events, Config).
+
 
 %%%-----------------------------------------------------------------
 %%% HELP FUNCTIONS
@@ -900,4 +918,40 @@ test_events(timetrap_fun) ->
      {?eh,tc_done,{timetrap_7_SUITE,end_per_suite,ok}},
      {?eh,test_done,{'DEF','STOP_TIME'}},
      {?eh,stop_logging,[]}
+    ];
+
+test_events(misc_errors) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,7}},
+     {?eh,tc_start,{misc_error_1_SUITE,ct_fail_1}},
+     {?eh,tc_done,{misc_error_1_SUITE,ct_fail_1,
+		   {failed,{error,{test_case_failed,{error,this_is_expected}}}}}},
+     {?eh,test_stats,{0,1,{0,0}}},
+     {?eh,tc_start,{misc_error_1_SUITE,ct_fail_2}},
+     {?eh,tc_done,{misc_error_1_SUITE,ct_fail_2,
+		   {failed,{error,{test_case_failed,"this_is_expected"}}}}},
+     {?eh,test_stats,{0,2,{0,0}}},
+     {?eh,tc_start,{misc_error_1_SUITE,ct_fail_3}},
+     {?eh,tc_done,{misc_error_1_SUITE,ct_fail_3,
+		   {failed,{error,{test_case_failed,this_is_expected}}}}},
+     {?eh,test_stats,{0,3,{0,0}}},
+     {?eh,tc_start,{misc_error_1_SUITE,ts_fail_1}},
+     {?eh,tc_done,{misc_error_1_SUITE,ts_fail_1,
+		   {failed,{error,{suite_failed,this_is_expected}}}}},
+     {?eh,test_stats,{0,4,{0,0}}},
+     {?eh,tc_start,{misc_error_1_SUITE,ts_fail_2}},
+     {?eh,tc_done,{misc_error_1_SUITE,ts_fail_2,
+		   {failed,{error,{suite_failed,this_is_expected}}}}},
+     {?eh,test_stats,{0,5,{0,0}}},
+     {?eh,tc_start,{misc_error_1_SUITE,killed_by_signal_1}},
+     {?eh,tc_done,{undefined,undefined,i_die_now}},
+     {?eh,test_stats,{0,6,{0,0}}},
+     {?eh,tc_start,{misc_error_1_SUITE,killed_by_signal_2}},
+     {?eh,tc_done,{undefined,undefined,
+		   {failed,testcase_aborted_or_killed}}},
+     {?eh,test_stats,{0,7,{0,0}}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
     ].
-- 
cgit v1.2.3