diff options
| author | Björn Gustavsson <[email protected]> | 2013-02-07 12:20:09 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2013-02-07 12:23:36 +0100 |
| commit | d45c6b727da8db7664d2cc08a16ef8ca68fe46df (patch) | |
| tree | 9c54e0860b805d379c4b770428b8a6ac2a603d9e /lib/asn1/test/testX420.erl | |
| parent | 258c6a4b0e393d6112c738ae0c4d4b7f699d5e47 (diff) | |
| parent | c310adbff67aa89f1ad3bff7c0a03c3506fe85ee (diff) | |
| download | otp-d45c6b727da8db7664d2cc08a16ef8ca68fe46df.tar.gz otp-d45c6b727da8db7664d2cc08a16ef8ca68fe46df.tar.bz2 otp-d45c6b727da8db7664d2cc08a16ef8ca68fe46df.zip | |
Merge branch 'maint-r15' into maint
* maint-r15:
Prepare release
Don't run testX420/1 on old slow Sparc systems
testX420: Pass Options to the ASN.1 compiler
asn1_erl_nif: Correct broken length encoding
asn1_SUITE: Mend broken test_modified_x420/1
Fix a bug for multiple extension addition groups
Diffstat (limited to 'lib/asn1/test/testX420.erl')
| -rw-r--r-- | lib/asn1/test/testX420.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/asn1/test/testX420.erl b/lib/asn1/test/testX420.erl index abdbbfe536..b222b15204 100644 --- a/lib/asn1/test/testX420.erl +++ b/lib/asn1/test/testX420.erl @@ -37,7 +37,7 @@ compile_loop(Erule, [Spec|Specs], Options, Config) when Erule == ber; Erule == ber_bin; Erule == ber_bin_v2; Erule == per -> CaseDir = ?config(case_dir, Config), asn1_test_lib:compile(filename:join([x420, Spec]), Config, - [Erule, {i, CaseDir}]), + [Erule, {i, CaseDir} | Options]), compile_loop(Erule, Specs, Options, Config); compile_loop(_Erule, _Specs, _Options, _Config) -> ok. |