aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2017-09-12 10:00:47 +0200
committerLukas Larsson <[email protected]>2017-09-12 10:00:47 +0200
commit18fb1a9230578456f3d03b4136ed296407bdf53c (patch)
tree4edfa1ba190f4ebbf3066cd394d9439bb7a62486 /erts/emulator
parent54d87b64ba447371fb51f1ad7e773317e684843f (diff)
parentbcfa4564df41ad5806a4848dcb3be31fbfea6a9e (diff)
downloadotp-18fb1a9230578456f3d03b4136ed296407bdf53c.tar.gz
otp-18fb1a9230578456f3d03b4136ed296407bdf53c.tar.bz2
otp-18fb1a9230578456f3d03b4136ed296407bdf53c.zip
Merge branch 'lukas/ct/ts_abort_on_compilation_fail' into maint
* lukas/ct/ts_abort_on_compilation_fail: erts: Fix leaking of fds in iovec_SUITE ts: Don't test apps that are not available asn1: Fix test suite deprecated functions ct: ts:run now abort the test run on compilation failure
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/test/iovec_SUITE.erl9
1 files changed, 8 insertions, 1 deletions
diff --git a/erts/emulator/test/iovec_SUITE.erl b/erts/emulator/test/iovec_SUITE.erl
index a5f605bfff..28df36d293 100644
--- a/erts/emulator/test/iovec_SUITE.erl
+++ b/erts/emulator/test/iovec_SUITE.erl
@@ -20,7 +20,7 @@
-module(iovec_SUITE).
--export([all/0, suite/0]).
+-export([all/0, suite/0, init_per_suite/1, end_per_suite/1]).
-export([integer_lists/1, binary_lists/1, empty_lists/1, empty_binary_lists/1,
mixed_lists/1, improper_lists/1, illegal_lists/1, cons_bomb/1,
@@ -37,6 +37,13 @@ all() ->
illegal_lists, improper_lists, cons_bomb, iolist_to_iovec_idempotence,
iolist_to_iovec_correctness].
+init_per_suite(Config) ->
+ Config.
+
+end_per_suite(Config) ->
+ application:stop(os_mon),
+ Config.
+
integer_lists(Config) when is_list(Config) ->
Variations = gen_variations([I || I <- lists:seq(1, 255)]),