diff options
| author | Adam Lindberg <[email protected]> | 2012-02-29 14:49:57 +0100 |
|---|---|---|
| committer | Adam Lindberg <[email protected]> | 2012-02-29 14:49:57 +0100 |
| commit | ca390f6bb00d14998faa8081a488a6d4889f1aea (patch) | |
| tree | 8045e9b208bf950b511fb20ca6d7371bad9a19a6 /lib/asn1/test/testSetOptional.erl | |
| parent | d3a96b096f457c881296c4e7f69de47399ab9ed8 (diff) | |
| parent | eda0a2d866060b18af6f06abbc9ea9e920de43b7 (diff) | |
| download | otp-ca390f6bb00d14998faa8081a488a6d4889f1aea.tar.gz otp-ca390f6bb00d14998faa8081a488a6d4889f1aea.tar.bz2 otp-ca390f6bb00d14998faa8081a488a6d4889f1aea.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/asn1/test/testSetOptional.erl')
| -rw-r--r-- | lib/asn1/test/testSetOptional.erl | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/lib/asn1/test/testSetOptional.erl b/lib/asn1/test/testSetOptional.erl index 035fa70424..4692941524 100644 --- a/lib/asn1/test/testSetOptional.erl +++ b/lib/asn1/test/testSetOptional.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2010. All Rights Reserved. +%% Copyright Ericsson AB 1997-2012. 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 @@ -20,7 +20,6 @@ -module(testSetOptional). -include("External.hrl"). --export([compile/3]). -export([main/1]). -export([ticket_7533/1,decoder/4]). -include_lib("test_server/include/test_server.hrl"). @@ -36,16 +35,6 @@ -record('SetOpt3Exp',{bool3 = asn1_NOVALUE, set3 = asn1_NOVALUE, int3 = asn1_NOVALUE}). -record('SetIn',{boolIn, intIn}). - -compile(Config,Rules,Options) -> - - ?line DataDir = ?config(data_dir,Config), - ?line OutDir = ?config(priv_dir,Config), - ?line true = code:add_patha(?config(priv_dir,Config)), - ?line ok = asn1ct:compile(DataDir ++ "SetOptional",[Rules,{outdir,OutDir}]++Options). - - - main(_Rules) -> ?line {ok,Bytes11} = @@ -204,9 +193,8 @@ ticket_7533(Ber) when Ber == ber; Ber == ber_bin -> io:format("Decode result: ~p~n",[Result]), ok after 10000 -> - exit(Pid,normal), io:format("Decode timeout~n",[]), - error + exit(Pid,normal) end; ticket_7533(_) -> ok. |