diff options
| author | Erlang/OTP <[email protected]> | 2010-08-27 11:45:31 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-08-27 11:45:31 +0200 |
| commit | 96db19557ac894cffcaa18e8f1191d387a5b05ea (patch) | |
| tree | 69b96b61bdc22073bce0b288cb22a77e0036e3ea /lib/asn1/test/asn1_SUITE.erl.src | |
| parent | 4a54b4ac3d9324e760c2839d5a224a461fd3f970 (diff) | |
| parent | 81b13cd0c640f131822b32b8a1e32c7f4b41faba (diff) | |
| download | otp-96db19557ac894cffcaa18e8f1191d387a5b05ea.tar.gz otp-96db19557ac894cffcaa18e8f1191d387a5b05ea.tar.bz2 otp-96db19557ac894cffcaa18e8f1191d387a5b05ea.zip | |
Merge branch 'kenneth/asn1/ExtensionAdditionGroup/OTP-8598' of ../kenneth_otp into HEAD
* 'kenneth/asn1/ExtensionAdditionGroup/OTP-8598' of ../kenneth_otp:
Update of vsn.mk, relnotes and appup for patch in R13B04 track
Add support for Extension addition group
Diffstat (limited to 'lib/asn1/test/asn1_SUITE.erl.src')
| -rw-r--r-- | lib/asn1/test/asn1_SUITE.erl.src | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/lib/asn1/test/asn1_SUITE.erl.src b/lib/asn1/test/asn1_SUITE.erl.src index 53a5cc5284..9377d23252 100644 --- a/lib/asn1/test/asn1_SUITE.erl.src +++ b/lib/asn1/test/asn1_SUITE.erl.src @@ -74,6 +74,7 @@ all(suite) -> [compile,parse,default_per,default_ber,default_per_opt,per, testSeqTypeRefPrim, testSeqTypeRefSeq, testSeqTypeRefSet, testSeqOf, testSeqOfIndefinite, testSeqOfCho, testSeqOfExternal, testSetDefault, testSetExtension, + testExtensionAdditionGroup, testSetExternal, testSeqOfTag, testSetOptional, testSetPrim, testSetTag, testSetTypeRefCho, testSetTypeRefPrim, testSetTypeRefSeq, testSetTypeRefSet, testSetOf, testSetOfCho, @@ -95,7 +96,7 @@ all(suite) -> [compile,parse,default_per,default_ber,default_per_opt,per, testSSLspecs, testNortel,test_undecoded_rest, test_inline, testTcapsystem, testNBAPsystem, test_compile_options,testDoubleEllipses, test_modified_x420, - testX420, test_x691,ticket_6143 + testX420, test_x691,ticket_6143, testExtensionAdditionGroup ] ++ common() ++ particular(). %all(suite) -> [test_inline,testNBAPsystem,test_compile_options,ticket_6143]. @@ -1036,7 +1037,6 @@ testSetExtension_cases(Rules) -> ?line testSetExtension:main(Rules). - testSetExternal(suite) -> []; testSetExternal(Config) -> ?line true = code:add_patha(?config(priv_dir,Config)), @@ -2237,10 +2237,10 @@ test_compile_options(Config) -> cover_compiled -> {skip,"Not runnable when cover compiled"}; _ -> - ?line ok = test_compile_options:wrong_path(Config), - ?line ok = test_compile_options:path(Config), - ?line ok = test_compile_options:noobj(Config), - ?line ok = test_compile_options:record_name_prefix(Config) + ?line ok = test_compile_options:wrong_path(Config), + ?line ok = test_compile_options:path(Config), + ?line ok = test_compile_options:noobj(Config), + ?line ok = test_compile_options:record_name_prefix(Config) end. testDoubleEllipses(suite) -> []; testDoubleEllipses(Config) -> @@ -2291,6 +2291,21 @@ ticket_6143(suite) -> []; ticket_6143(Config) -> ?line ok = test_compile_options:ticket_6143(Config). +testExtensionAdditionGroup(suite) -> []; +testExtensionAdditionGroup(Config) -> + ?line DataDir = ?config(data_dir,Config), + ?line PrivDir = ?config(priv_dir,Config), + ?line Path = code:get_path(), + ?line code:add_patha(PrivDir), + DoIt = fun(Erule) -> + ?line ok = asn1ct:compile(filename:join(DataDir,"Extension-Addition-Group"),[Erule,{outdir,PrivDir}]), + ?line {ok,_M} = compile:file(filename:join(DataDir,"extensionAdditionGroup"),[{i,PrivDir},{outdir,PrivDir},debug_info]), + ?line ok = extensionAdditionGroup:run(Erule) + end, + ?line [DoIt(Rule)|| Rule <- [per_bin,uper_bin,ber_bin]], + ?line code:set_path(Path). + + % parse_modules() -> % ["ImportsFrom"]. |