diff options
author | Adam Lindberg <[email protected]> | 2012-01-12 15:42:21 +0100 |
---|---|---|
committer | Adam Lindberg <[email protected]> | 2012-02-28 14:59:32 +0100 |
commit | aa4e27ebac9eb287069fab859fe5dcdab82c75bf (patch) | |
tree | 7303d7d5f04c888a7934b783937ac2e3dc7f978a /lib/asn1/test/asn1_SUITE.erl.src | |
parent | 93f0641c2122d6c23e2ac5f18579ef879599fc16 (diff) | |
download | otp-aa4e27ebac9eb287069fab859fe5dcdab82c75bf.tar.gz otp-aa4e27ebac9eb287069fab859fe5dcdab82c75bf.tar.bz2 otp-aa4e27ebac9eb287069fab859fe5dcdab82c75bf.zip |
[asn1] Make tables and processes unnamed
- Refactor and clean up asn1_db process
- Remove unused stop function in asn1ct.erl
- Remove infinite loop possibilites in asn1ct_check.erl
- test/1,2,3 now run in separate process
- Update documentation for new test options
Diffstat (limited to 'lib/asn1/test/asn1_SUITE.erl.src')
-rw-r--r-- | lib/asn1/test/asn1_SUITE.erl.src | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/lib/asn1/test/asn1_SUITE.erl.src b/lib/asn1/test/asn1_SUITE.erl.src index 3f51b125ec..912170fe12 100644 --- a/lib/asn1/test/asn1_SUITE.erl.src +++ b/lib/asn1/test/asn1_SUITE.erl.src @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2001-2011. All Rights Reserved. +%% Copyright Ericsson AB 2001-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 @@ -1469,21 +1469,21 @@ per(Config) -> per1([M|T],DataDir,OutDir) -> ?line ok = asn1ct:compile(DataDir ++ M,[?PER,{outdir,OutDir}]), - ?line ok = asn1ct:test(list_to_atom(M)), + ?line ok = asn1ct:test(list_to_atom(M), [{i, OutDir}]), per1(T,DataDir,OutDir); per1([],_,_) -> ok. per1_bit_opt([M|T],DataDir,OutDir) -> ?line ok = asn1ct:compile(DataDir ++ M,[?PER,optimize,{outdir,OutDir}]), - ?line ok = asn1ct:test(list_to_atom(M)), + ?line ok = asn1ct:test(list_to_atom(M), [{i, OutDir}]), per1_bit_opt(T,DataDir,OutDir); per1_bit_opt([],_,_) -> ok. per1_opt([M|T],DataDir,OutDir) -> ?line ok = asn1ct:compile(DataDir ++ M,[?PER,optimized,{outdir,OutDir}]), - ?line ok = asn1ct:test(list_to_atom(M)), + ?line ok = asn1ct:test(list_to_atom(M), [{i, OutDir}]), per1_opt(T,DataDir,OutDir); per1_opt([],_,_) -> ok. @@ -1546,7 +1546,7 @@ ber_other(Config) -> ber1([M|T],DataDir,OutDir) -> ?line ok = asn1ct:compile(DataDir ++ M,[?BER,{outdir,OutDir}]), - ?line ok = asn1ct:test(list_to_atom(M)), + ?line ok = asn1ct:test(list_to_atom(M), [{i, OutDir}]), ber1(T,DataDir,OutDir); ber1([],_,_) -> ok. @@ -1948,22 +1948,22 @@ testContextSwitchingTypes(Config) -> ?line true = code:add_patha(?config(priv_dir,Config)), ?line testContextSwitchingTypes:compile(Config,?BER,[]), - ?line testContextSwitchingTypes:test(), + ?line testContextSwitchingTypes:test(Config), ?line ?ber_driver(?BER,testContextSwitchingTypes:compile(Config,?BER,[driver])), - ?line ?ber_driver(?BER,testContextSwitchingTypes:test()), + ?line ?ber_driver(?BER,testContextSwitchingTypes:test(Config)), ?line testContextSwitchingTypes:compile(Config,?PER,[]), - ?line testContextSwitchingTypes:test(), + ?line testContextSwitchingTypes:test(Config), ?line ?per_bit_opt(testContextSwitchingTypes:compile(Config,?PER,[optimize])), - ?line ?per_bit_opt(testContextSwitchingTypes:test()), + ?line ?per_bit_opt(testContextSwitchingTypes:test(Config)), ?line ?uper_bin(testContextSwitchingTypes:compile(Config,uper_bin,[])), - ?line ?uper_bin(testContextSwitchingTypes:test()), + ?line ?uper_bin(testContextSwitchingTypes:test(Config)), ?line testContextSwitchingTypes:compile(Config,?PER,[optimize]), - ?line testContextSwitchingTypes:test(). + ?line testContextSwitchingTypes:test(Config). testTypeValueNotation(suite) -> []; testTypeValueNotation(Config) -> @@ -2181,22 +2181,22 @@ test_undecoded_rest(suite) -> []; test_undecoded_rest(Config) -> ?line ok = test_undecoded_rest:compile(Config,?BER,[]), - ?line ok = test_undecoded_rest:test([]), + ?line ok = test_undecoded_rest:test([], Config), ?line ok = test_undecoded_rest:compile(Config,?BER,[undec_rest]), - ?line ok = test_undecoded_rest:test(undec_rest), + ?line ok = test_undecoded_rest:test(undec_rest, Config), ?line ok = test_undecoded_rest:compile(Config,?PER,[]), - ?line ok = test_undecoded_rest:test([]), + ?line ok = test_undecoded_rest:test([], Config), ?line ?per_bit_opt(ok = test_undecoded_rest:compile(Config,?PER,[optimize,undec_rest])), - ?line ?per_bit_opt(ok = test_undecoded_rest:test(undec_rest)), + ?line ?per_bit_opt(ok = test_undecoded_rest:test(undec_rest, Config)), ?line ?uper_bin(ok = test_undecoded_rest:compile(Config,uper_bin,[undec_rest])), - ?line ?uper_bin(ok = test_undecoded_rest:test(undec_rest)), + ?line ?uper_bin(ok = test_undecoded_rest:test(undec_rest, Config)), ?line ok = test_undecoded_rest:compile(Config,?PER,[undec_rest]), - ?line ok = test_undecoded_rest:test(undec_rest). + ?line ok = test_undecoded_rest:test(undec_rest, Config). test_inline(suite) -> []; test_inline(Config) -> @@ -2205,7 +2205,7 @@ test_inline(Config) -> {skip,"Not runnable when cover compiled"}; _ -> ?line ok=test_inline:compile(Config,?BER,[]), - ?line test_inline:main(?BER), + ?line test_inline:main(Config, ?BER), ?line test_inline:inline1(Config,?BER,[]), ?line test_inline:performance2() end. |