aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2016-03-07 07:36:02 +0100
committerBjörn Gustavsson <[email protected]>2016-03-07 07:36:02 +0100
commit2de2dfd3e18eaba3f994a0cfa490957ee8a49686 (patch)
tree6902ea94ab534e13cda5740bb0487a0157c78bb9
parent9020ce9ab8347a781d4f761a1389bec4fd2bb468 (diff)
parent5560415efb7cf2d361f63525bf599c5303c78f32 (diff)
downloadotp-2de2dfd3e18eaba3f994a0cfa490957ee8a49686.tar.gz
otp-2de2dfd3e18eaba3f994a0cfa490957ee8a49686.tar.bz2
otp-2de2dfd3e18eaba3f994a0cfa490957ee8a49686.zip
Merge branch 'bjorn/asn1/fix-recursion-problem' into maint
* bjorn/asn1/fix-recursion-problem: 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 ce87fd3180..6dea1787a8 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.