diff options
| author | Henrik Nord <[email protected]> | 2014-01-21 15:12:36 +0100 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2014-01-21 15:12:39 +0100 |
| commit | bd6781bb72d35bd3bd994ef2ce49dad4eea473bb (patch) | |
| tree | 4fd5600694b126ab4c5880523d3d037698176b0e /lib | |
| parent | 65459a5c2d809a301b144463768690626a046d47 (diff) | |
| parent | 7182141bdc028d3c2f802ec72ac70e58ef1c1b7a (diff) | |
| download | otp-bd6781bb72d35bd3bd994ef2ce49dad4eea473bb.tar.gz otp-bd6781bb72d35bd3bd994ef2ce49dad4eea473bb.tar.bz2 otp-bd6781bb72d35bd3bd994ef2ce49dad4eea473bb.zip | |
Merge branch 'hawk/reltool_undefined_regexp'
* hawk/reltool_undefined_regexp:
Add missing default value for regexps in reltool It caused a function clause in lists:sort/1:
OTP-11591
OTP-11592
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/reltool/src/reltool_utils.erl | 2 | ||||
| -rw-r--r-- | lib/reltool/test/reltool_server_SUITE.erl | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/lib/reltool/src/reltool_utils.erl b/lib/reltool/src/reltool_utils.erl index 9af8f6bae8..5a3f34506d 100644 --- a/lib/reltool/src/reltool_utils.erl +++ b/lib/reltool/src/reltool_utils.erl @@ -589,6 +589,8 @@ throw_error(Format, Args) -> %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +decode_regexps(Key, Regexps, undefined) -> + decode_regexps(Key, Regexps, []); decode_regexps(Key, {add, Regexps}, Old) when is_list(Regexps) -> do_decode_regexps(Key, Regexps, Old); decode_regexps(_Key, {del, Regexps}, Old) when is_list(Regexps) -> diff --git a/lib/reltool/test/reltool_server_SUITE.erl b/lib/reltool/test/reltool_server_SUITE.erl index feeac9e099..bfe5d39d53 100644 --- a/lib/reltool/test/reltool_server_SUITE.erl +++ b/lib/reltool/test/reltool_server_SUITE.erl @@ -143,7 +143,8 @@ all() -> mod_incl_cond_derived, use_selected_vsn, use_selected_vsn_relative_path, - non_standard_vsn_id]. + non_standard_vsn_id, + undefined_regexp]. groups() -> []. @@ -2506,6 +2507,12 @@ non_standard_vsn_id(Config) -> reltool_server:get_app(Pid2,b)), ok. +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +undefined_regexp(_Config) -> + ?msym({ok,_}, + reltool:get_config([{sys,[{app,asn1,[{excl_app_filters, + {add, ["^priv"]}}]}]}])), + ok. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% Library functions |