aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib/test
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2010-12-03 18:37:54 +0100
committerSverker Eriksson <[email protected]>2010-12-03 18:37:54 +0100
commit1ad422e1a745f5e20beb4a3612c499ec2472530d (patch)
tree21b31d1c17672f735a26acb4c3c4925befb6a930 /lib/stdlib/test
parent0878f9b9daa32c5c0ec4fc3ca349bf5ba4455b8b (diff)
parent9721c1107364ab6b13bde4ae0dbb772bf7f0b154 (diff)
downloadotp-1ad422e1a745f5e20beb4a3612c499ec2472530d.tar.gz
otp-1ad422e1a745f5e20beb4a3612c499ec2472530d.tar.bz2
otp-1ad422e1a745f5e20beb4a3612c499ec2472530d.zip
Merge branch 'sverker/ets_compress/OTP-8922' into dev
* sverker/ets_compress/OTP-8922: Fix ets_SUITE:types to not fail due to false mem leaks
Diffstat (limited to 'lib/stdlib/test')
-rw-r--r--lib/stdlib/test/ets_SUITE.erl12
1 files changed, 12 insertions, 0 deletions
diff --git a/lib/stdlib/test/ets_SUITE.erl b/lib/stdlib/test/ets_SUITE.erl
index b621b17441..620848003c 100644
--- a/lib/stdlib/test/ets_SUITE.erl
+++ b/lib/stdlib/test/ets_SUITE.erl
@@ -5688,6 +5688,7 @@ make_ext_ref() ->
Ref.
init_externals() ->
+ SysDistSz = ets:info(sys_dist,size),
?line Pa = filename:dirname(code:which(?MODULE)),
?line {ok, Node} = test_server:start_node(plopp, slave, [{args, " -pa " ++ Pa}]),
?line Res = case rpc:call(Node, ?MODULE, rpc_externals, []) of
@@ -5696,6 +5697,17 @@ init_externals() ->
R -> R
end,
?line test_server:stop_node(Node),
+
+ %% Wait for table 'sys_dist' to stabilize
+ repeat_while(fun() ->
+ case ets:info(sys_dist,size) of
+ SysDistSz -> false;
+ Sz ->
+ io:format("Waiting for sys_dist to revert size from ~p to size ~p\n",
+ [Sz, SysDistSz]),
+ receive after 1000 -> true end
+ end
+ end),
put(externals, Res).
rpc_externals() ->