diff options
| author | Patrik Nyblom <[email protected]> | 2010-09-13 10:52:43 +0200 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2010-09-13 10:52:43 +0200 |
| commit | 525fd7b044e78ae54527af6b0a21a2c7d49f78c9 (patch) | |
| tree | 9e6a833aa20a436a3e2a2ffa99a4ff60f49db7fb /lib/erl_interface/test/ei_connect_SUITE.erl | |
| parent | e5f1c776df55a965f2f61d9881f17c8bf32e8621 (diff) | |
| parent | d9ad7fc091e850d9484e3f1fdf9ede22f9a18e04 (diff) | |
| download | otp-525fd7b044e78ae54527af6b0a21a2c7d49f78c9.tar.gz otp-525fd7b044e78ae54527af6b0a21a2c7d49f78c9.tar.bz2 otp-525fd7b044e78ae54527af6b0a21a2c7d49f78c9.zip | |
Merge branch 'pan/windows-testcases/OTP-8820' into dev
* pan/windows-testcases/OTP-8820:
Teach Winsock initialization to be thread safe
Make ei_threaded_send synchronized
Increase timeout value in ei_accept_SUITE
Teach ei_accept_SUITE to wait for node publish instead of using random sleeps
Teach port suite to not use unix-specific commands and not leave them running
Add line macros to gen_udp_SUITE:connect
Diffstat (limited to 'lib/erl_interface/test/ei_connect_SUITE.erl')
| -rw-r--r-- | lib/erl_interface/test/ei_connect_SUITE.erl | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/erl_interface/test/ei_connect_SUITE.erl b/lib/erl_interface/test/ei_connect_SUITE.erl index 56f478edad..fe82a73ef9 100644 --- a/lib/erl_interface/test/ei_connect_SUITE.erl +++ b/lib/erl_interface/test/ei_connect_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2001-2009. All Rights Reserved. +%% Copyright Ericsson AB 2001-2010. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -103,10 +103,12 @@ ei_threaded_send(Config) when is_list(Config) -> ?line Einode = filename:join(?config(data_dir, Config), "einode"), ?line N = 15, ?line Host = atom_to_list(node()), - ?line spawn_link(fun() -> start_einode(Einode, N, Host) end), ?line TestServerPid = self(), ?line [ spawn_link(fun() -> rec_einode(I, TestServerPid) end) || I <- lists:seq(0, N-1) ], + ?line [ receive {I,registered} -> ok end + || I <- lists:seq(0, N-1) ], + ?line spawn_link(fun() -> start_einode(Einode, N, Host) end), ?line [ receive I -> ok end || I <- lists:seq(0, N-1) ], ok. @@ -114,6 +116,7 @@ ei_threaded_send(Config) when is_list(Config) -> rec_einode(N, TestServerPid) -> ?line Regname = list_to_atom("mth"++integer_to_list(N)), ?line register(Regname, self()), + ?line TestServerPid ! {N, registered}, ?line io:format("~p waiting~n", [Regname]), ?line receive X -> |