aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2017-12-13 20:14:56 +0100
committerSverker Eriksson <[email protected]>2017-12-20 15:19:32 +0100
commit6789b20533b4a848953fa7af34d9ba3a4c89c5ca (patch)
treea22d2999a057d4dce04b014d8c77ab277b8aa170 /erts/emulator
parent881240485b96cfa7d4a75587f6f14c4e6c83eeeb (diff)
downloadotp-6789b20533b4a848953fa7af34d9ba3a4c89c5ca.tar.gz
otp-6789b20533b4a848953fa7af34d9ba3a4c89c5ca.tar.bz2
otp-6789b20533b4a848953fa7af34d9ba3a4c89c5ca.zip
erts: Fix alloc_SUITE:migration
It crashed due to recursive calls to alloc_util in carrier initialization test callback.
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/test/alloc_SUITE.erl5
1 files changed, 4 insertions, 1 deletions
diff --git a/erts/emulator/test/alloc_SUITE.erl b/erts/emulator/test/alloc_SUITE.erl
index 518e0c974a..022cda88e8 100644
--- a/erts/emulator/test/alloc_SUITE.erl
+++ b/erts/emulator/test/alloc_SUITE.erl
@@ -67,7 +67,10 @@ cpool(Cfg) -> drv_case(Cfg).
migration(Cfg) ->
case erlang:system_info(smp_support) of
true ->
- drv_case(Cfg, concurrent, "+MZe true");
+ %% Enable test_alloc.
+ %% Disable driver_alloc to avoid recursive alloc_util calls
+ %% through enif_mutex_create() in my_creating_mbc().
+ drv_case(Cfg, concurrent, "+MZe true +MRe false");
false ->
{skipped, "No smp"}
end.