aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2011-12-06 18:15:41 +0100
committerRickard Green <[email protected]>2011-12-06 18:15:41 +0100
commit043d670abaa83ab5b368228d2ac8dd0b2751768f (patch)
tree8d82196efbf9728f03bbcd7944fbd9dadf460e9c /erts/emulator
parent3e9a9af2f8b2e68fa6ee0bd0876b144d054d298f (diff)
parent8f7f2ba4ec4a94a414cd33ab5ad9486784e6f674 (diff)
downloadotp-043d670abaa83ab5b368228d2ac8dd0b2751768f.tar.gz
otp-043d670abaa83ab5b368228d2ac8dd0b2751768f.tar.bz2
otp-043d670abaa83ab5b368228d2ac8dd0b2751768f.zip
Merge branch 'rickard/test-fixes-r15b'
* rickard/test-fixes-r15b: Ensure test-proc is dead before stopping node
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/test/scheduler_SUITE.erl20
1 files changed, 13 insertions, 7 deletions
diff --git a/erts/emulator/test/scheduler_SUITE.erl b/erts/emulator/test/scheduler_SUITE.erl
index 05553c2028..c7ec3cbe41 100644
--- a/erts/emulator/test/scheduler_SUITE.erl
+++ b/erts/emulator/test/scheduler_SUITE.erl
@@ -519,13 +519,19 @@ bound_loop(NS, N, M, Sched) ->
bindings(Node, BindType) ->
Parent = self(),
Ref = make_ref(),
- spawn_link(Node,
- fun () ->
- enable_internal_state(),
- Res = (catch erts_debug:get_internal_state(
- {fake_scheduler_bindings, BindType})),
- Parent ! {Ref, Res}
- end),
+ Pid = spawn_link(Node,
+ fun () ->
+ enable_internal_state(),
+ Res = (catch erts_debug:get_internal_state(
+ {fake_scheduler_bindings,
+ BindType})),
+ Parent ! {Ref, Res}
+ end),
+ Mon = erlang:monitor(process, Pid),
+ receive
+ {'DOWN', Mon, _, _, _} ->
+ ok
+ end,
receive
{Ref, Res} ->
?t:format("~p: ~p~n", [BindType, Res]),