diff options
| author | Kenneth Lundin <[email protected]> | 2010-10-05 16:06:04 +0200 |
|---|---|---|
| committer | Kenneth Lundin <[email protected]> | 2010-10-05 16:06:04 +0200 |
| commit | 6b2512b424d077f98693f2bd3a8445eb084bdc06 (patch) | |
| tree | 53175cf0d1f3a254b9c8d0934c2f452625ee1215 /lib/asn1/test/asn1_SUITE.erl.src | |
| parent | 3cfec17ff7aff97c5ec862a8b9e97d245849f9c3 (diff) | |
| parent | ffb54d7428a15e44da8f7c1649c73d677f4462f3 (diff) | |
| download | otp-6b2512b424d077f98693f2bd3a8445eb084bdc06.tar.gz otp-6b2512b424d077f98693f2bd3a8445eb084bdc06.tar.bz2 otp-6b2512b424d077f98693f2bd3a8445eb084bdc06.zip | |
Merge branch 'maint-r13' into dev
Conflicts:
lib/asn1/doc/src/notes.xml
lib/asn1/test/asn1_SUITE.erl.src
lib/asn1/test/asn1_SUITE_data/extensionAdditionGroup.erl
lib/asn1/test/test_undecoded_rest.erl
lib/asn1/vsn.mk
Diffstat (limited to 'lib/asn1/test/asn1_SUITE.erl.src')
| -rw-r--r-- | lib/asn1/test/asn1_SUITE.erl.src | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/asn1/test/asn1_SUITE.erl.src b/lib/asn1/test/asn1_SUITE.erl.src index fad094c988..e1a09adc82 100644 --- a/lib/asn1/test/asn1_SUITE.erl.src +++ b/lib/asn1/test/asn1_SUITE.erl.src @@ -2302,9 +2302,12 @@ testExtensionAdditionGroup(Config) -> ?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), - ?line ok = extensionAdditionGroup:run2(Erule) + ?line ok = extensionAdditionGroup:run2(Erule), + ?line ok = asn1ct:compile(filename:join(DataDir,"EUTRA-RRC-Definitions"),Erule ++ [{record_name_prefix,"RRC-"},{outdir,PrivDir}]), + ?line ok = extensionAdditionGroup:run3(Erule) end, - ?line [DoIt(Rule)|| Rule <- [[per_bin],[per_bin,optimize],[uper_bin],[ber_bin],[ber_bin,optimize]]], + ?line [DoIt(Rule)|| Rule <- [[per_bin],[per_bin,optimize],[uper_bin]]], + %% FIXME problems with automatic tags [ber_bin],[ber_bin,optimize] ?line code:set_path(Path). |