aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenneth Lundin <[email protected]>2011-05-11 17:05:45 +0200
committerKenneth Lundin <[email protected]>2011-05-11 17:05:45 +0200
commit1bae2eb502808757a7877b86f2d8eb74b8092a09 (patch)
treea3a2bda88855bfdad85404e1cf50e50dea658dbe
parent40e1c9e3804919f74d16958c97cf74147ef5b08c (diff)
parent01c5a21bac6b7c5ca94dd08ef3abee23ba8a86dc (diff)
downloadotp-1bae2eb502808757a7877b86f2d8eb74b8092a09.tar.gz
otp-1bae2eb502808757a7877b86f2d8eb74b8092a09.tar.bz2
otp-1bae2eb502808757a7877b86f2d8eb74b8092a09.zip
Merge branch 'kenneth/asn1/failingtests/OTP-9286' into dev
* kenneth/asn1/failingtests/OTP-9286: Corrected test case that failed because of the removal of a catch in timer:tc
-rw-r--r--lib/asn1/test/test_inline.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/asn1/test/test_inline.erl b/lib/asn1/test/test_inline.erl
index dfa3c134ae..b7ec0d8921 100644
--- a/lib/asn1/test/test_inline.erl
+++ b/lib/asn1/test/test_inline.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2004-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2011. 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
@@ -173,8 +173,8 @@ mi_encdec(N,Val) ->
m_encdec(0,_) ->
ok;
m_encdec(N,Val) ->
- {ok,B}='Mod1':encode('L',Val),
- {ok,_R}='Mod1':decode('L',B),
+ {ok,B}='Mod':encode('L',Val),
+ {ok,_R}='Mod':decode('L',B),
m_encdec(N-1,Val).