aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2016-12-16 15:04:03 +0100
committerSverker Eriksson <[email protected]>2016-12-16 15:04:03 +0100
commit8362491325db87bd7d561399f8ef8c849df22d33 (patch)
treeaca8bfaa7491c99e2d2bf8d7931f04368c8105c2 /erts
parent277d97ce2a00087b878698506bbea0ef1e3070b6 (diff)
parenta92eef5de3c1978d005747394473ba9fcab6407c (diff)
downloadotp-8362491325db87bd7d561399f8ef8c849df22d33.tar.gz
otp-8362491325db87bd7d561399f8ef8c849df22d33.tar.bz2
otp-8362491325db87bd7d561399f8ef8c849df22d33.zip
Merge branch 'maint'
Diffstat (limited to 'erts')
-rw-r--r--erts/emulator/test/code_SUITE.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/test/code_SUITE.erl b/erts/emulator/test/code_SUITE.erl
index 0742b77a52..b29520ab9f 100644
--- a/erts/emulator/test/code_SUITE.erl
+++ b/erts/emulator/test/code_SUITE.erl
@@ -65,9 +65,9 @@ versions(Config) when is_list(Config) ->
2 = versions:version(),
%% Kill processes, unload code.
- P1 ! P2 ! done,
_ = monitor(process, P1),
_ = monitor(process, P2),
+ P1 ! P2 ! done,
receive
{'DOWN',_,process,P1,normal} -> ok
end,