diff options
| author | Björn Gustavsson <[email protected]> | 2012-05-10 16:05:08 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2012-05-10 17:13:02 +0200 |
| commit | 3136c77b2e8e2801343558d6c79b4a7cb9d06117 (patch) | |
| tree | cfa21e37218d8e8f0e9986e3c105d10ac960019c /erts/emulator/test/code_SUITE.erl | |
| parent | 04745e3fbb5fe194bc7561f96300d821e7f9e2aa (diff) | |
| download | otp-3136c77b2e8e2801343558d6c79b4a7cb9d06117.tar.gz otp-3136c77b2e8e2801343558d6c79b4a7cb9d06117.tar.bz2 otp-3136c77b2e8e2801343558d6c79b4a7cb9d06117.zip | |
Remove workarounds for hybrid and shared heaps in test suites
Diffstat (limited to 'erts/emulator/test/code_SUITE.erl')
| -rw-r--r-- | erts/emulator/test/code_SUITE.erl | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/erts/emulator/test/code_SUITE.erl b/erts/emulator/test/code_SUITE.erl index 25ce94096f..74ce5e397a 100644 --- a/erts/emulator/test/code_SUITE.erl +++ b/erts/emulator/test/code_SUITE.erl @@ -135,14 +135,7 @@ new_binary_types(Config) when is_list(Config) -> bit_sized_binary(Bin))), ok. -t_check_process_code(doc) -> "Test check_process_code/2."; t_check_process_code(Config) when is_list(Config) -> - case erlang:system_info(heap_type) of - private -> t_check_process_code_1(Config); - hybrid -> {skip,"Hybrid heap"} - end. - -t_check_process_code_1(Config) -> ?line Priv = ?config(priv_dir, Config), ?line Data = ?config(data_dir, Config), ?line File = filename:join(Data, "my_code_test"), @@ -247,12 +240,10 @@ gc1() -> ok. t_check_process_code_ets(doc) -> "Test check_process_code/2 in combination with a fun obtained from an ets table."; t_check_process_code_ets(Config) when is_list(Config) -> - case {test_server:is_native(?MODULE),erlang:system_info(heap_type)} of - {true,_} -> - {skipped,"Native code"}; - {_,hybrid} -> - {skipped,"Hybrid heap"}; - {false,private} -> + case test_server:is_native(?MODULE) of + true -> + {skip,"Native code"}; + false -> do_check_process_code_ets(Config) end. @@ -397,9 +388,7 @@ module_md5_ok(Code) -> make_stub(Config) when is_list(Config) -> - %% No old code to purge if hybrid heap because of skipped test cases, - %% so we'll need a catch here. - ?line (catch erlang:purge_module(my_code_test)), + catch erlang:purge_module(my_code_test), ?line Data = ?config(data_dir, Config), ?line File = filename:join(Data, "my_code_test"), @@ -433,9 +422,7 @@ make_stub(Config) when is_list(Config) -> ok. make_stub_many_funs(Config) when is_list(Config) -> - %% No old code to purge if hybrid heap because of skipped test cases, - %% so we'll need a catch here. - ?line (catch erlang:purge_module(many_funs)), + catch erlang:purge_module(many_funs), ?line Data = ?config(data_dir, Config), ?line File = filename:join(Data, "many_funs"), |