aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2016-12-16 15:02:03 +0100
committerSverker Eriksson <[email protected]>2016-12-16 15:02:03 +0100
commita92eef5de3c1978d005747394473ba9fcab6407c (patch)
treed04b2cc4a9382bc0383dba4483b1901e1d4243c0 /erts/emulator
parent029cf2d296304e7559449fb48d6e2ee756f19e12 (diff)
parenta07fc6fbcdf270e29332cd2556511b5f04e3d476 (diff)
downloadotp-a92eef5de3c1978d005747394473ba9fcab6407c.tar.gz
otp-a92eef5de3c1978d005747394473ba9fcab6407c.tar.bz2
otp-a92eef5de3c1978d005747394473ba9fcab6407c.zip
Merge branch 'sverker/cuddle-code_SUITE-versions' into maint
* sverker/cuddle-code_SUITE-versions: erts: Fix hanging race in code_SUITE:versions
Diffstat (limited to 'erts/emulator')
-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 34515efa3d..3ee14f2d1c 100644
--- a/erts/emulator/test/code_SUITE.erl
+++ b/erts/emulator/test/code_SUITE.erl
@@ -66,9 +66,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,