diff options
| author | Lukas Larsson <[email protected]> | 2012-06-04 11:51:03 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2012-06-04 11:59:03 +0200 |
| commit | 0374be0e7caf06a9d1af3daef2cea1f7b20a57ab (patch) | |
| tree | 23385b33daa358eaf0a7dc290257f82207d412c9 /erts/emulator/test/fun_SUITE.erl | |
| parent | 868f5446c1f133cc29fc2ef274697460886374c6 (diff) | |
| parent | 9cfeeb9b7e66a3345cbc0e5b4b634cb5965635fc (diff) | |
| download | otp-0374be0e7caf06a9d1af3daef2cea1f7b20a57ab.tar.gz otp-0374be0e7caf06a9d1af3daef2cea1f7b20a57ab.tar.bz2 otp-0374be0e7caf06a9d1af3daef2cea1f7b20a57ab.zip | |
Merge branch 'maint'
* maint:
Remove stale code for hybrid heap and incremental GC
Remove the hipe_bifs:show_message_area/0 BIF
Remove support for erlang:system_info(global_heaps_size)
Remove the erlang:garbage_collect_message_area/0 BIF
Remove workarounds for hybrid and shared heaps in test suites
Conflicts:
erts/doc/src/erlang.xml
erts/emulator/beam/erl_message.c
erts/emulator/beam/erl_process.c
erts/emulator/beam/erl_process.h
erts/emulator/hipe/hipe_bif2.tab
lib/hipe/cerl/erl_bif_types.erl
Diffstat (limited to 'erts/emulator/test/fun_SUITE.erl')
| -rw-r--r-- | erts/emulator/test/fun_SUITE.erl | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/erts/emulator/test/fun_SUITE.erl b/erts/emulator/test/fun_SUITE.erl index 559e540016..839ad6a4f4 100644 --- a/erts/emulator/test/fun_SUITE.erl +++ b/erts/emulator/test/fun_SUITE.erl @@ -539,12 +539,6 @@ bad_md5(Bad) -> {'EXIT',{badarg,_}} = (catch erlang:md5(Bad)). refc(Config) when is_list(Config) -> - case erlang:system_info(heap_type) of - private -> refc_1(); - hybrid -> {skip,"Hybrid heap"} - end. - -refc_1() -> ?line F1 = fun_factory(2), ?line {refc,2} = erlang:fun_info(F1, refc), ?line F2 = fun_factory(42), @@ -570,12 +564,6 @@ fun_factory(Const) -> fun(X) -> X + Const end. refc_ets(Config) when is_list(Config) -> - case erlang:system_info(heap_type) of - private -> refc_ets_1(); - hybrid -> {skip,"Hybrid heap"} - end. - -refc_ets_1() -> ?line F = fun(X) -> X + 33 end, ?line {refc,2} = erlang:fun_info(F, refc), @@ -622,12 +610,6 @@ refc_ets_bag(F1, Options) -> ok. refc_dist(Config) when is_list(Config) -> - case erlang:system_info(heap_type) of - private -> refc_dist_1(); - hybrid -> {skip,"Hybrid heap"} - end. - -refc_dist_1() -> ?line {ok,Node} = start_node(fun_SUITE_refc_dist), ?line process_flag(trap_exit, true), ?line Pid = spawn_link(Node, |