diff options
author | Fredrik Gustafsson <[email protected]> | 2013-06-04 14:41:11 +0200 |
---|---|---|
committer | Fredrik Gustafsson <[email protected]> | 2013-06-04 14:41:11 +0200 |
commit | 57b24ccd49fc005d685aeebd363531a8ed86e6bc (patch) | |
tree | cccfa608d4aa543a60151352fbdbec01760b2c42 /lib/stdlib/test | |
parent | e83fd8f94aba352b6cc055d2b4cfff007911b6d4 (diff) | |
parent | 66c5325d80aaee54bda10ff0ebb4c79a4fea24d0 (diff) | |
download | otp-57b24ccd49fc005d685aeebd363531a8ed86e6bc.tar.gz otp-57b24ccd49fc005d685aeebd363531a8ed86e6bc.tar.bz2 otp-57b24ccd49fc005d685aeebd363531a8ed86e6bc.zip |
Merge branch 'maint'
Conflicts:
bootstrap/lib/stdlib/ebin/erl_pp.beam
Diffstat (limited to 'lib/stdlib/test')
-rw-r--r-- | lib/stdlib/test/erl_pp_SUITE.erl | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/lib/stdlib/test/erl_pp_SUITE.erl b/lib/stdlib/test/erl_pp_SUITE.erl index 70688907b8..70a9d70e5c 100644 --- a/lib/stdlib/test/erl_pp_SUITE.erl +++ b/lib/stdlib/test/erl_pp_SUITE.erl @@ -43,7 +43,7 @@ receive_after/1, bits/1, head_tail/1, cond1/1, block/1, case1/1, ops/1, messages/1, old_mnemosyne_syntax/1, - import_export/1, misc_attrs/1, + import_export/1, misc_attrs/1, dialyzer_attrs/1, hook/1, neg_indent/1, @@ -77,7 +77,7 @@ groups() -> [func, call, recs, try_catch, if_then, receive_after, bits, head_tail, cond1, block, case1, ops, messages, old_mnemosyne_syntax]}, - {attributes, [], [misc_attrs, import_export]}, + {attributes, [], [misc_attrs, import_export, dialyzer_attrs]}, {tickets, [], [otp_6321, otp_6911, otp_6914, otp_8150, otp_8238, otp_8473, otp_8522, otp_8567, otp_8664, otp_9147, @@ -597,6 +597,15 @@ misc_attrs(Config) when is_list(Config) -> ok. +dialyzer_attrs(suite) -> + []; +dialyzer_attrs(Config) when is_list(Config) -> + ok = pp_forms(<<"-type foo() :: #bar{}. ">>), + ok = pp_forms(<<"-opaque foo() :: {bar, fun((X, [42,...]) -> X)}. ">>), + ok = pp_forms(<<"-spec foo(bar(), qux()) -> [T | baz(T)]. ">>), + ok = pp_forms(<<"-callback foo(<<_:32,_:_*4>>, T) -> T. ">>), + ok. + hook(suite) -> []; hook(Config) when is_list(Config) -> |