aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2016-03-15 15:54:57 +0100
committerSverker Eriksson <[email protected]>2016-03-15 17:58:12 +0100
commite5557304f49127ece23b9a524db24c20e43bea36 (patch)
tree20cf1c5672c1cab84e88272a0d151abfc20b88b6
parent2deb875adb4a921e758223a45fcd2e2df89124bc (diff)
downloadotp-e5557304f49127ece23b9a524db24c20e43bea36.tar.gz
otp-e5557304f49127ece23b9a524db24c20e43bea36.tar.bz2
otp-e5557304f49127ece23b9a524db24c20e43bea36.zip
stdlib: Cuddle with ets_SUITE:evil_rename
to make it kill and then wait for all spawned processes to exit.
-rw-r--r--lib/stdlib/test/ets_SUITE.erl13
1 files changed, 8 insertions, 5 deletions
diff --git a/lib/stdlib/test/ets_SUITE.erl b/lib/stdlib/test/ets_SUITE.erl
index 678c225d25..fd0ff0e252 100644
--- a/lib/stdlib/test/ets_SUITE.erl
+++ b/lib/stdlib/test/ets_SUITE.erl
@@ -2497,9 +2497,10 @@ rename_unnamed_do(Opts) ->
%% Rename a table with many fixations, and at the same time delete it.
evil_rename(Config) when is_list(Config) ->
- evil_rename_1(old_hash, new_hash, [public,named_table]),
EtsMem = etsmem(),
+ evil_rename_1(old_hash, new_hash, [public,named_table]),
evil_rename_1(old_tree, new_tree, [public,ordered_set,named_table]),
+ wait_for_test_procs(true),
verify_etsmem(EtsMem).
evil_rename_1(Old, New, Flags) ->
@@ -2540,7 +2541,8 @@ crazy_fixtable_wait(N, Dracula) ->
crazy_fixtable_1(0, _) ->
ok;
crazy_fixtable_1(N, Fun) ->
- spawn_link(Fun),
+ %%FIXME my_spawn_link(Fun),
+ my_spawn_link(Fun),
crazy_fixtable_1(N-1, Fun).
evil_creater_destroyer() ->
@@ -5752,10 +5754,11 @@ spawn_logger(Procs, FailedMemchecks) ->
after 0 ->
case Kill of
true -> exit(Proc, kill);
- _ -> ok
+ _ ->
+ erlang:display({"Waiting for 'DOWN' from", Proc,
+ process_info(Proc),
+ pid_status(Proc)})
end,
- erlang:display({"Waiting for 'DOWN' from", Proc,
- process_info(Proc), pid_status(Proc)}),
receive
{'DOWN', Mon, _, _, _} ->
ok