diff options
| author | Matthew Sackman <matthew@lshift.net> | 2010-02-15 17:57:42 +0000 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2010-02-15 17:57:42 +0000 |
| commit | f20ce77105b37c9e783b853caeed81bc86a25b29 (patch) | |
| tree | d7a2370d0059662ef2ea1fa7926a819763e3317c /src | |
| parent | fb3049db75b4aaa1f54b431db42dfcfd4af4ffd4 (diff) | |
| parent | 4bd04cce92e09bd9b39fe77d2837e2307051a835 (diff) | |
| download | rabbitmq-server-git-f20ce77105b37c9e783b853caeed81bc86a25b29.tar.gz | |
merge default ⇨ bug 21673
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_multi.erl | 5 | ||||
| -rw-r--r-- | src/rabbit_tests.erl | 9 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/rabbit_multi.erl b/src/rabbit_multi.erl index dddffee700..9cb2c03cd7 100644 --- a/src/rabbit_multi.erl +++ b/src/rabbit_multi.erl @@ -222,9 +222,8 @@ run_rabbitmq_server() -> {win32, fun run_rabbitmq_server_win32/0}]). run_rabbitmq_server_unix() -> - FullPath = getenv("RABBITMQ_SCRIPT_HOME") ++ "/rabbitmq-server", - erlang:open_port({spawn_executable, FullPath}, - [{arg0, FullPath}, {args, ["-noinput"]}, nouse_stdio]). + CmdLine = getenv("RABBITMQ_SCRIPT_HOME") ++ "/rabbitmq-server -noinput", + erlang:open_port({spawn, CmdLine}, [nouse_stdio]). run_rabbitmq_server_win32() -> Cmd = filename:nativename(os:find_executable("cmd")), diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl index ec736199f5..f77640dff4 100644 --- a/src/rabbit_tests.erl +++ b/src/rabbit_tests.erl @@ -31,7 +31,7 @@ -module(rabbit_tests). --compile(export_all). +-compile([export_all]). -export([all_tests/0, test_parsing/0]). @@ -277,7 +277,7 @@ test_simple_n_element_queue(N) -> test_pg_local() -> [P, Q] = [spawn(fun () -> receive X -> X end end) || _ <- [x, x]], check_pg_local(ok, [], []), - check_pg_local(pg_local:join(a, P), [P], []), + check_pg_local(pg_local:join(a, P), [P], []), check_pg_local(pg_local:join(b, P), [P], [P]), check_pg_local(pg_local:join(a, P), [P, P], [P]), check_pg_local(pg_local:join(a, Q), [P, P, Q], [P]), @@ -287,7 +287,10 @@ test_pg_local() -> check_pg_local(pg_local:leave(b, P), [P, Q], [Q, Q]), check_pg_local(pg_local:leave(a, P), [Q], [Q, Q]), check_pg_local(pg_local:leave(a, P), [Q], [Q, Q]), - [X ! done || X <- [P, Q]], + [begin X ! done, + Ref = erlang:monitor(process, X), + receive {'DOWN', Ref, process, X, _Info} -> ok end + end || X <- [P, Q]], check_pg_local(ok, [], []), passed. |