diff options
| author | Patrik Nyblom <[email protected]> | 2012-04-17 16:15:11 +0200 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2012-04-17 16:19:49 +0200 |
| commit | b0534e7f668f12b0d48e139c5ddbfcd85eaff4ce (patch) | |
| tree | e4e6afa0a9a395aec7651c0d56c0f782163c1d5f /lib/dialyzer/test | |
| parent | f1a49c45e4b2ec746407fd777ba31fec6cab118e (diff) | |
| parent | d6d38a42650880bcd6c1f93c5797958857e82d60 (diff) | |
| download | otp-b0534e7f668f12b0d48e139c5ddbfcd85eaff4ce.tar.gz otp-b0534e7f668f12b0d48e139c5ddbfcd85eaff4ce.tar.bz2 otp-b0534e7f668f12b0d48e139c5ddbfcd85eaff4ce.zip | |
Merge branch 'pg/r15/add-os-pid-to-port-info' into maint
* pg/r15/add-os-pid-to-port-info:
tests: Remove line macro from port_bif_SUITE
Correct documentation, erl_bif_types and dialyzer tests
Make port_info(Port,os_pid) work on Windows
Extend erlang:port_info/1,2 to show the OS pid of a spawned process
OTP-10057
Diffstat (limited to 'lib/dialyzer/test')
| -rw-r--r-- | lib/dialyzer/test/small_SUITE_data/results/port_info_test | 3 | ||||
| -rw-r--r-- | lib/dialyzer/test/small_SUITE_data/src/port_info_test.erl | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lib/dialyzer/test/small_SUITE_data/results/port_info_test b/lib/dialyzer/test/small_SUITE_data/results/port_info_test index 9ee863f9eb..863a3d61df 100644 --- a/lib/dialyzer/test/small_SUITE_data/results/port_info_test +++ b/lib/dialyzer/test/small_SUITE_data/results/port_info_test @@ -3,4 +3,5 @@ port_info_test.erl:10: The pattern {'connected', 42} can never match the type 'u port_info_test.erl:14: The pattern {'registered_name', "42"} can never match the type 'undefined' | {'registered_name',atom()} port_info_test.erl:19: The pattern {'output', 42} can never match the type 'undefined' | {'connected',pid()} port_info_test.erl:24: Guard test 'links' =:= Atom::'connected' can never succeed -port_info_test.erl:28: The pattern {'gazonk', _} can never match the type 'undefined' | {'connected' | 'id' | 'input' | 'links' | 'name' | 'output' | 'registered_name',atom() | pid() | [pid() | char()] | integer()} +port_info_test.erl:28: The pattern {'gazonk', _} can never match the type 'undefined' | {'connected' | 'id' | 'input' | 'links' | 'name' | 'os_pid' | 'output' | 'registered_name',atom() | pid() | [pid() | char()] | integer()} +port_info_test.erl:32: The pattern {'os_pid', "42"} can never match the type 'undefined' | {'os_pid','undefined' | non_neg_integer()} diff --git a/lib/dialyzer/test/small_SUITE_data/src/port_info_test.erl b/lib/dialyzer/test/small_SUITE_data/src/port_info_test.erl index 2ee9a3a6e2..07f22256c9 100644 --- a/lib/dialyzer/test/small_SUITE_data/src/port_info_test.erl +++ b/lib/dialyzer/test/small_SUITE_data/src/port_info_test.erl @@ -3,7 +3,7 @@ %% and the quality of the warnings that Dialyzer spits out %% -module(port_info_test). --export([t1/1, t2/1, t3/1, t4/1, t5/2, buggy/1]). +-export([t1/1, t2/1, t3/1, t4/1, t5/2, t6/1, buggy/1]). %% The following errors are correctly caught, but the messages are a bit weird t1(X) when is_port(X) -> @@ -28,6 +28,10 @@ t5(X, Atom) when is_port(X) -> {gazonk, _} = erlang:port_info(X, Atom); t5(_, _) -> ok. +t6(X) when is_port(X) -> + {os_pid, "42"} = erlang:port_info(X, os_pid); +t6(_) -> ok. + %% The type system is not strong enough to catch the following errors buggy(X) when is_atom(X) -> {links, X} = erlang:port_info(foo, X). |