aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2011-07-28 10:38:47 +0200
committerSverker Eriksson <[email protected]>2011-07-28 10:38:47 +0200
commit6d1abe8e4872d118ebff0ae2e131884f50eb2b7a (patch)
tree2e6dc837caa022f0c4b34b9096dbd18bab6d5879 /erts
parent91f542de43d442b98e87d47c2d57234531b7828a (diff)
parent388bb54ba7128c1242c3fbee8a45168bd20110a4 (diff)
downloadotp-6d1abe8e4872d118ebff0ae2e131884f50eb2b7a.tar.gz
otp-6d1abe8e4872d118ebff0ae2e131884f50eb2b7a.tar.bz2
otp-6d1abe8e4872d118ebff0ae2e131884f50eb2b7a.zip
Merge branch 'dev' into major
Diffstat (limited to 'erts')
-rw-r--r--erts/emulator/test/fun_SUITE.erl10
1 files changed, 2 insertions, 8 deletions
diff --git a/erts/emulator/test/fun_SUITE.erl b/erts/emulator/test/fun_SUITE.erl
index 7795efe57e..559e540016 100644
--- a/erts/emulator/test/fun_SUITE.erl
+++ b/erts/emulator/test/fun_SUITE.erl
@@ -647,17 +647,11 @@ refc_dist_1() ->
%% Fun is passed in an exit signal. Wait until it is gone.
?line wait_until(fun () -> 4 =/= fun_refc(F2) end),
?line 3 = fun_refc(F2),
- erts_debug:set_internal_state(available_internal_state, true),
- ?line F_refc = case erts_debug:get_internal_state(force_heap_frags) of
- false -> 3;
- true -> 2 % GC after bif already decreased it
- end,
- ?line F_refc = fun_refc(F),
- erts_debug:set_internal_state(available_internal_state, false),
+ ?line true = erlang:garbage_collect(),
+ ?line 2 = fun_refc(F),
refc_dist_send(Node, F).
refc_dist_send(Node, F) ->
- ?line true = erlang:garbage_collect(),
?line Pid = spawn_link(Node,
fun() -> receive
{To,Fun} when is_function(Fun) ->