aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2011-07-27 17:05:19 +0200
committerSverker Eriksson <[email protected]>2011-07-27 17:05:19 +0200
commit388bb54ba7128c1242c3fbee8a45168bd20110a4 (patch)
tree46a3398b8696d934c28d2fcce7a00b29b83f33d4
parent74ced1a2b0cbea40c45b41ca52b0191ff3ebfcbf (diff)
parent8af1010d7920c38c71821c846f86f848b9beb909 (diff)
downloadotp-388bb54ba7128c1242c3fbee8a45168bd20110a4.tar.gz
otp-388bb54ba7128c1242c3fbee8a45168bd20110a4.tar.bz2
otp-388bb54ba7128c1242c3fbee8a45168bd20110a4.zip
Merge branch 'sverker/fun_SUITE-refc_dist-gcfix' into dev
* sverker/fun_SUITE-refc_dist-gcfix: Fix test case fun_SUITE:refc_dist
-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) ->