diff options
| author | Kenneth Lundin <[email protected]> | 2010-09-10 12:09:00 +0200 |
|---|---|---|
| committer | Kenneth Lundin <[email protected]> | 2010-09-10 12:09:00 +0200 |
| commit | 357860d3b5def55eba80523c0be83ee4ebcab12c (patch) | |
| tree | ce7ecf49f15053bd9aafd460e6201a7d6d44e33a /lib/asn1/test/asn1_SUITE.erl.src | |
| parent | 1470138027905c4adfd87d805457a40b39c2bdc6 (diff) | |
| parent | 210fbb984619e6a6bb1122b7a6f72f54fb72effb (diff) | |
| download | otp-357860d3b5def55eba80523c0be83ee4ebcab12c.tar.gz otp-357860d3b5def55eba80523c0be83ee4ebcab12c.tar.bz2 otp-357860d3b5def55eba80523c0be83ee4ebcab12c.zip | |
Merge branch 'kenneth/asn1/nested_extaddgroup/OTP-8797' into dev
* kenneth/asn1/nested_extaddgroup/OTP-8797:
Add support for ExtensionAdditionGroup notation in nested types as well
Conflicts:
lib/asn1/test/test_undecoded_rest.erl
Diffstat (limited to 'lib/asn1/test/asn1_SUITE.erl.src')
| -rw-r--r-- | lib/asn1/test/asn1_SUITE.erl.src | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/asn1/test/asn1_SUITE.erl.src b/lib/asn1/test/asn1_SUITE.erl.src index f0228546a5..fad094c988 100644 --- a/lib/asn1/test/asn1_SUITE.erl.src +++ b/lib/asn1/test/asn1_SUITE.erl.src @@ -2299,11 +2299,12 @@ testExtensionAdditionGroup(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 = 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:run(Erule), + ?line ok = extensionAdditionGroup:run2(Erule) end, - ?line [DoIt(Rule)|| Rule <- [per_bin,uper_bin,ber_bin]], + ?line [DoIt(Rule)|| Rule <- [[per_bin],[per_bin,optimize],[uper_bin],[ber_bin],[ber_bin,optimize]]], ?line code:set_path(Path). |