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 | c666e18f0fcc20cf8eaeba423824883aa01e2f78 (patch) | |
| tree | 4ab35d724ce0ce01881bcf246df30c357388707a | |
| parent | e7cc9b2e81128632d3cd0a1d357527b7f5faa5f8 (diff) | |
| parent | ce7542e6bc53d3d1ff34133cdf70a8db39e315b0 (diff) | |
| download | otp-c666e18f0fcc20cf8eaeba423824883aa01e2f78.tar.gz otp-c666e18f0fcc20cf8eaeba423824883aa01e2f78.tar.bz2 otp-c666e18f0fcc20cf8eaeba423824883aa01e2f78.zip | |
Merge branch 'bjorn/asn1/test-cases' into maint-r15
* bjorn/asn1/test-cases:
Don't run testX420/1 on old slow Sparc systems
testX420: Pass Options to the ASN.1 compiler
| -rw-r--r-- | lib/asn1/test/asn1_SUITE.erl | 7 | ||||
| -rw-r--r-- | lib/asn1/test/testX420.erl | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lib/asn1/test/asn1_SUITE.erl b/lib/asn1/test/asn1_SUITE.erl index 9a6201455d..d264cf24f5 100644 --- a/lib/asn1/test/asn1_SUITE.erl +++ b/lib/asn1/test/asn1_SUITE.erl @@ -1064,7 +1064,12 @@ test_modified_x420(Config) -> testX420() -> [{timetrap,{minutes,90}}]. testX420(Config) -> - test(Config, fun testX420/3, [ber, ber_bin, ber_bin_v2]). + case erlang:system_info(system_architecture) of + "sparc-sun-solaris2.10" -> + {skip,"Too slow for an old Sparc"}; + _ -> + test(Config, fun testX420/3, [ber, ber_bin, ber_bin_v2]) + end. testX420(Config, Rule, Opts) -> testX420:compile(Rule, [der|Opts], Config), ok = testX420:ticket7759(Rule, Config), 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. |