aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Gustavsson <bjorn@erlang.org>2013-09-16 10:12:01 +0200
committerBjörn Gustavsson <bjorn@erlang.org>2013-09-18 11:45:01 +0200
commite389b27d6c6971cee5be5a9b45703d9af6b6cb39 (patch)
treeee8f2c7a8b0cc02fe2bd5cde0a0d98e99bd836b1
parenta6c2074bb0b7d54f3a5db41867d203f847598a3a (diff)
downloadotp-e389b27d6c6971cee5be5a9b45703d9af6b6cb39.tar.gz
otp-e389b27d6c6971cee5be5a9b45703d9af6b6cb39.tar.bz2
otp-e389b27d6c6971cee5be5a9b45703d9af6b6cb39.zip
No longer compile the X420 specs for plain BER
We used to compile the X420 specs for both DER and PER, but 9ec0a0ba changed that to compile for DER and plain BER (probably accidentally). Since the X420 suite contains 99 source files and compilations takes more than 40 seconds on my computer for one backend, we only want to do compilations that are likely to find bugs. Compiling with the BER backend after having compiled for the DER backend is very unlikely to detect any bugs. Compiling for PER (as well as DER) is slightly more likely to expose bugs, but I don't think it is worth the extra running time for the test suite.
-rw-r--r--lib/asn1/test/asn1_SUITE.erl8
-rw-r--r--lib/asn1/test/testX420.erl2
2 files changed, 4 insertions, 6 deletions
diff --git a/lib/asn1/test/asn1_SUITE.erl b/lib/asn1/test/asn1_SUITE.erl
index 8a17620531..a558a2941f 100644
--- a/lib/asn1/test/asn1_SUITE.erl
+++ b/lib/asn1/test/asn1_SUITE.erl
@@ -993,12 +993,10 @@ testX420(Config) ->
"sparc-sun-solaris2.10" ->
{skip,"Too slow for an old Sparc"};
_ ->
- test(Config, fun testX420/3, [ber])
+ Rule = ber,
+ testX420:compile(Rule, [der], Config),
+ ok = testX420:ticket7759(Rule, Config)
end.
-testX420(Config, Rule, Opts) ->
- testX420:compile(Rule, [der|Opts], Config),
- ok = testX420:ticket7759(Rule, Config),
- testX420:compile(Rule, Opts, Config).
test_x691(Config) ->
test(Config, fun test_x691/3, [per, uper]).
diff --git a/lib/asn1/test/testX420.erl b/lib/asn1/test/testX420.erl
index 00c9221e9d..4ddc55dc16 100644
--- a/lib/asn1/test/testX420.erl
+++ b/lib/asn1/test/testX420.erl
@@ -26,7 +26,7 @@
-include_lib("test_server/include/test_server.hrl").
-compile(Erule, Options, Config) when Erule =:= ber; Erule =:= per ->
+compile(Erule, Options, Config) ->
Specs0 = specs(),
99 = length(Specs0),
CaseDir = ?config(case_dir, Config),