diff options
author | Henrik Nord <[email protected]> | 2012-10-03 15:20:09 +0200 |
---|---|---|
committer | Henrik Nord <[email protected]> | 2012-10-03 15:20:09 +0200 |
commit | 197b7b99b9e7e70046d51fa90b5922a1b22ee8cc (patch) | |
tree | 3b11293ba7a0ab2229b5b3b9da072be041f29c0f /lib/dialyzer/src/dialyzer.erl | |
parent | 54e7cc9086908a0e5642caa6ac3680557acc5a67 (diff) | |
parent | ab151d0adebc31fbb74adffa69e4524f69dc8b62 (diff) | |
download | otp-197b7b99b9e7e70046d51fa90b5922a1b22ee8cc.tar.gz otp-197b7b99b9e7e70046d51fa90b5922a1b22ee8cc.tar.bz2 otp-197b7b99b9e7e70046d51fa90b5922a1b22ee8cc.zip |
Merge branch 'maint'
Diffstat (limited to 'lib/dialyzer/src/dialyzer.erl')
-rw-r--r-- | lib/dialyzer/src/dialyzer.erl | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/lib/dialyzer/src/dialyzer.erl b/lib/dialyzer/src/dialyzer.erl index d875c45c4a..63c51e219a 100644 --- a/lib/dialyzer/src/dialyzer.erl +++ b/lib/dialyzer/src/dialyzer.erl @@ -162,14 +162,17 @@ run(Opts) -> {error, Msg} -> throw({dialyzer_error, Msg}); OptsRecord -> - case cl_check_init(OptsRecord) of - {ok, ?RET_NOTHING_SUSPICIOUS} -> - case dialyzer_cl:start(OptsRecord) of - {?RET_DISCREPANCIES, Warnings} -> Warnings; - {?RET_NOTHING_SUSPICIOUS, []} -> [] - end; - {error, ErrorMsg1} -> - throw({dialyzer_error, ErrorMsg1}) + case OptsRecord#options.check_plt of + true -> + case cl_check_init(OptsRecord) of + {ok, ?RET_NOTHING_SUSPICIOUS} -> ok; + {error, ErrorMsg1} -> throw({dialyzer_error, ErrorMsg1}) + end; + false -> ok + end, + case dialyzer_cl:start(OptsRecord) of + {?RET_DISCREPANCIES, Warnings} -> Warnings; + {?RET_NOTHING_SUSPICIOUS, []} -> [] end catch throw:{dialyzer_error, ErrorMsg} -> |