aboutsummaryrefslogtreecommitdiffstats
path: root/lib/test_server
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2011-03-07 14:57:56 +0100
committerMicael Karlberg <[email protected]>2011-03-07 14:57:56 +0100
commite91ecef78904be02bb785fdff0dcaf6d38176ba7 (patch)
tree74622d0cfdd0e3c935b4600cf57c3c7a8d9ebc1d /lib/test_server
parent2ff2b4ee1b50eb621e436f7c448808d67d6690df (diff)
parentf85c79166c0fcf39eaab62e39f392aa7ce83c9bf (diff)
downloadotp-e91ecef78904be02bb785fdff0dcaf6d38176ba7.tar.gz
otp-e91ecef78904be02bb785fdff0dcaf6d38176ba7.tar.bz2
otp-e91ecef78904be02bb785fdff0dcaf6d38176ba7.zip
Merge branch 'dev' into bmk/snmp/support_ipv6_transport_address
Diffstat (limited to 'lib/test_server')
-rw-r--r--lib/test_server/src/ts_install_cth.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/test_server/src/ts_install_cth.erl b/lib/test_server/src/ts_install_cth.erl
index f8b4e5a4f8..d1a24525ab 100644
--- a/lib/test_server/src/ts_install_cth.erl
+++ b/lib/test_server/src/ts_install_cth.erl
@@ -112,7 +112,7 @@ pre_init_per_suite(_Suite,Config,State) ->
catch Error:Reason ->
Stack = erlang:get_stacktrace(),
ct:pal("~p failed! ~p:{~p,~p}",[?MODULE,Error,Reason,Stack]),
- {fail,{?MODULE,{Error,Reason, Stack}}}
+ {{fail,{?MODULE,{Error,Reason, Stack}}},State}
end.
%% @doc Called after init_per_suite.