diff options
author | Micael Karlberg <[email protected]> | 2013-04-10 08:56:22 +0200 |
---|---|---|
committer | Micael Karlberg <[email protected]> | 2013-04-10 08:56:22 +0200 |
commit | fab2332f524c81a3e0186928cf3b64ee3190e259 (patch) | |
tree | 5fa9d0b336d7b23c20605a1141188d62c0461ed3 /lib/megaco/test/megaco_codec_flex_lib.erl | |
parent | d2c7d9ffb3ceffdb324ce93fc2ea2f442f12c1fe (diff) | |
parent | 6de586ffb9bbc60b15e64a0b9696140093b925f1 (diff) | |
download | otp-fab2332f524c81a3e0186928cf3b64ee3190e259.tar.gz otp-fab2332f524c81a3e0186928cf3b64ee3190e259.tar.bz2 otp-fab2332f524c81a3e0186928cf3b64ee3190e259.zip |
Merge branch 'bmk/megaco/flex_scanner_core/seq12263' into bmk/megaco/flex_buffer_overrun_while_scanning_prop_parms/OTP-10998/r13
Conflicts:
lib/megaco/src/flex/megaco_flex_scanner_drv.flex.src
Diffstat (limited to 'lib/megaco/test/megaco_codec_flex_lib.erl')
-rw-r--r-- | lib/megaco/test/megaco_codec_flex_lib.erl | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/megaco/test/megaco_codec_flex_lib.erl b/lib/megaco/test/megaco_codec_flex_lib.erl index de76956711..3e70454faf 100644 --- a/lib/megaco/test/megaco_codec_flex_lib.erl +++ b/lib/megaco/test/megaco_codec_flex_lib.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2007-2009. All Rights Reserved. +%% Copyright Ericsson AB 2007-2013. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -49,8 +49,14 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% init(Config) when is_list(Config) -> + %% io:format("~w:init -> entry with" + %% "~n Config: ~p" + %% "~n", [?MODULE, Config]), Flag = process_flag(trap_exit, true), Res = (catch start()), + %% io:format("~w:init -> start result" + %% "~n Res: ~p" + %% "~n", [?MODULE, Res]), process_flag(trap_exit, Flag), case Res of {error, Reason} -> |