aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2017-09-12 10:01:15 +0200
committerLukas Larsson <[email protected]>2017-09-12 10:01:15 +0200
commitc22e19bf3b5f735fb9007c07cfd6251a61d3d492 (patch)
tree3b2f58b9e860a86d11ba9869f992e052893fb115 /erts/emulator
parent39c3d2ed3f6f7c15e7f726f0cb444d2b79775146 (diff)
parent18fb1a9230578456f3d03b4136ed296407bdf53c (diff)
downloadotp-c22e19bf3b5f735fb9007c07cfd6251a61d3d492.tar.gz
otp-c22e19bf3b5f735fb9007c07cfd6251a61d3d492.tar.bz2
otp-c22e19bf3b5f735fb9007c07cfd6251a61d3d492.zip
Merge branch 'maint'
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)]),