diff options
| author | Erlang/OTP <[email protected]> | 2013-02-06 14:47:12 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2013-02-06 14:47:12 +0100 |
| commit | a30a45e158978a6bc13684505f10d5e3824ee819 (patch) | |
| tree | bd07c843b963495026af782b4aad284bed628d9a /lib/asn1/test/asn1_SUITE.erl | |
| parent | b4b0029f031818a9dce605b73551bca2ed3a01f4 (diff) | |
| parent | 0fd671609f7b31a9313d1575434e7273f3f2cd09 (diff) | |
| download | otp-a30a45e158978a6bc13684505f10d5e3824ee819.tar.gz otp-a30a45e158978a6bc13684505f10d5e3824ee819.tar.bz2 otp-a30a45e158978a6bc13684505f10d5e3824ee819.zip | |
Merge branch 'bjorn/asn1/open-type-error/OTP-10805' into maint-r15
* bjorn/asn1/open-type-error/OTP-10805:
asn1_erl_nif: Correct broken length encoding
asn1_SUITE: Mend broken test_modified_x420/1
Diffstat (limited to 'lib/asn1/test/asn1_SUITE.erl')
| -rw-r--r-- | lib/asn1/test/asn1_SUITE.erl | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/asn1/test/asn1_SUITE.erl b/lib/asn1/test/asn1_SUITE.erl index 90cd391242..12569273bd 100644 --- a/lib/asn1/test/asn1_SUITE.erl +++ b/lib/asn1/test/asn1_SUITE.erl @@ -1054,11 +1054,14 @@ testDoubleEllipses(Config, Rule, Opts) -> testDoubleEllipses:main(Rule). test_modified_x420(Config) -> + test(Config, fun test_modified_x420/3, + [ber,ber_bin,ber_bin_v2,{ber_bin_v2,[nif]}]). +test_modified_x420(Config, Rule, Opts) -> Files = [filename:join(modified_x420, F) || F <- ["PKCS7", "InformationFramework", "AuthenticationFramework"]], - asn1_test_lib:compile_all(Files, Config, [der]), - test_modified_x420:test_io(Config). + asn1_test_lib:compile_all(Files, Config, [Rule,der|Opts]), + test_modified_x420:test(Config). testX420() -> |