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/scheduler_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/scheduler_SUITE.erl')
| -rw-r--r-- | erts/emulator/test/scheduler_SUITE.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/test/scheduler_SUITE.erl b/erts/emulator/test/scheduler_SUITE.erl index 64c280b198..0b4b302908 100644 --- a/erts/emulator/test/scheduler_SUITE.erl +++ b/erts/emulator/test/scheduler_SUITE.erl @@ -876,7 +876,7 @@ get_affinity_mask(_Port, _Status, Affinity) -> Affinity. get_affinity_mask() -> - case test_server:os_type() of + case os:type() of {unix, linux} -> case catch open_port({spawn, "taskset -p " ++ os:getpid()}, [exit_status]) of @@ -1733,7 +1733,7 @@ sched_state([], N, DC, DI) -> {N, DC, DI} catch _ : _ -> - ?t:fail({inconsisten_scheduler_state, {N, DC, DI}}) + ct:fail({inconsisten_scheduler_state, {N, DC, DI}}) end; sched_state([{normal, _, _, _} = S | Rest], _S, DC, DI) -> sched_state(Rest, S, DC, DI); |