diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2016-04-08 14:54:01 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2016-04-08 14:54:01 +0200 |
| commit | cb37a1e06d0d7d9b7721604eaaa55a45e234162b (patch) | |
| tree | 388192cecf48362e6c81ed64369644eecdc0e34c /erts/emulator/test/multi_load_SUITE.erl | |
| parent | 0e1e90907ae76aae80f15316c2e43200a70d639b (diff) | |
| parent | d827807d703f03d0d6bdbc771e569b046828c274 (diff) | |
| download | otp-cb37a1e06d0d7d9b7721604eaaa55a45e234162b.tar.gz otp-cb37a1e06d0d7d9b7721604eaaa55a45e234162b.tar.bz2 otp-cb37a1e06d0d7d9b7721604eaaa55a45e234162b.zip | |
Merge branch 'egil/erts/cuddle-tests'
* egil/erts/cuddle-tests:
Additional logging for alloc_SUITE
Replace test_server:os_type/0 with os:type/0
Let low_prio test run a bit longer
Increase timetrap for atom_roundtrip_r15b
Remove unnecessary ct boilerplate in suite
Don't divide by zero in test logging
Use ct:fail/1 instead of test_server:fail/1
Relax node_container_SUITE
Increase timetrap timeout for op_SUITE:bsl_bsr/1
Increase timetrap timeout for port_SUITE:huge_env/1
Diffstat (limited to 'erts/emulator/test/multi_load_SUITE.erl')
| -rw-r--r-- | erts/emulator/test/multi_load_SUITE.erl | 29 |
1 files changed, 7 insertions, 22 deletions
diff --git a/erts/emulator/test/multi_load_SUITE.erl b/erts/emulator/test/multi_load_SUITE.erl index 784b239116..e8769ea208 100644 --- a/erts/emulator/test/multi_load_SUITE.erl +++ b/erts/emulator/test/multi_load_SUITE.erl @@ -19,32 +19,16 @@ %% -module(multi_load_SUITE). --export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, - init_per_group/2,end_per_group/2, - many/1,on_load/1,errors/1]). +-export([all/0, suite/0, many/1, on_load/1, errors/1]). -include_lib("common_test/include/ct.hrl"). -suite() -> [{ct_hooks,[ts_install_cth]}]. +suite() -> + [{ct_hooks,[ts_install_cth]}]. all() -> [many,on_load,errors]. -groups() -> - []. - -init_per_suite(Config) -> - Config. - -end_per_suite(_Config) -> - ok. - -init_per_group(_GroupName, Config) -> - Config. - -end_per_group(_GroupName, Config) -> - Config. - many(_Config) -> Ms = make_modules(100, fun many_module/1), @@ -57,7 +41,6 @@ many(_Config) -> io:put_chars("Heavy load\n" "=========="), many_measure(Ms), - ok. many_module(M) -> @@ -81,9 +64,12 @@ many_measure(Ms) -> "Sequential: ~9w µs\n" "Parallel: ~9w µs\n" "Ratio: ~9w\n", - [length(Ms),Us1,Us2,round(Us1/Us2)]), + [length(Ms),Us1,Us2,divide(Us1,Us2)]), ok. +divide(A,B) when B > 0 -> A div B; +divide(_,_) -> inf. + many_load_seq(Ms) -> [erlang:finish_loading([M]) || M <- Ms], ok. @@ -135,7 +121,6 @@ on_load(_Config) -> SingleOnPrep = tl(OnPrep), {on_load,[OnLoadMod]} = erlang:finish_loading(SingleOnPrep), ok = erlang:call_on_load_function(OnLoadMod), - ok. on_load_module(M) -> |