From 6789b20533b4a848953fa7af34d9ba3a4c89c5ca Mon Sep 17 00:00:00 2001
From: Sverker Eriksson <sverker@erlang.org>
Date: Wed, 13 Dec 2017 20:14:56 +0100
Subject: erts: Fix alloc_SUITE:migration

It crashed due to recursive calls to alloc_util
in carrier initialization test callback.
---
 erts/emulator/test/alloc_SUITE.erl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'erts/emulator/test')

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.
-- 
cgit v1.2.3