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/beam/code_ix.h | |
| 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/beam/code_ix.h')
0 files changed, 0 insertions, 0 deletions