aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2016-03-07 07:39:28 +0100
committerBjörn Gustavsson <[email protected]>2016-03-07 07:39:28 +0100
commit870ff4c7935032df00ef49746d70583d504fcd7c (patch)
treeabf893113dba296cb549d15810abe3eea35545c8
parent98776b2d3ed7c9aff31f0233d763403ff84eeb77 (diff)
parent2de2dfd3e18eaba3f994a0cfa490957ee8a49686 (diff)
downloadotp-870ff4c7935032df00ef49746d70583d504fcd7c.tar.gz
otp-870ff4c7935032df00ef49746d70583d504fcd7c.tar.bz2
otp-870ff4c7935032df00ef49746d70583d504fcd7c.zip
Merge branch 'maint'
* maint: asn1_SUITE_value: Don't test the LDAP module
-rw-r--r--lib/asn1/test/asn1_SUITE.erl22
1 files changed, 16 insertions, 6 deletions
diff --git a/lib/asn1/test/asn1_SUITE.erl b/lib/asn1/test/asn1_SUITE.erl
index d392055458..7214c4b300 100644
--- a/lib/asn1/test/asn1_SUITE.erl
+++ b/lib/asn1/test/asn1_SUITE.erl
@@ -628,12 +628,22 @@ ber_other(Config, Rule, Opts) ->
der(Config) ->
asn1_test_lib:compile_all(ber_modules(), Config, [der]).
-module_test(M, Config, Rule, Opts) ->
- asn1_test_lib:compile(M, Config, [Rule|Opts]),
- case asn1ct:test(list_to_atom(M), [{i, ?config(case_dir, Config)}]) of
- ok -> ok;
- Error ->
- erlang:error({test_failed, M, Opts, Error})
+module_test(M0, Config, Rule, Opts) ->
+ asn1_test_lib:compile(M0, Config, [Rule|Opts]),
+ case list_to_atom(M0) of
+ 'LDAP' ->
+ %% Because of the recursive definition of 'Filter' in
+ %% the LDAP module, the construction of a sample
+ %% value for 'Filter' is not guaranteed to terminate.
+ ok;
+ M ->
+ TestOpts = [{i, ?config(case_dir, Config)}],
+ case asn1ct:test(M, TestOpts) of
+ ok ->
+ ok;
+ Error ->
+ erlang:error({test_failed, M, Opts, Error})
+ end
end.