From 7f951996600d1d09c8afa422beadf7bdde772471 Mon Sep 17 00:00:00 2001
From: Rickard Green <rickard@erlang.org>
Date: Wed, 22 Jun 2016 16:54:49 +0200
Subject: Fix scheduler_SUITE:scheduler_suspend test

---
 erts/emulator/test/scheduler_SUITE.erl | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

(limited to 'erts/emulator/test')

diff --git a/erts/emulator/test/scheduler_SUITE.erl b/erts/emulator/test/scheduler_SUITE.erl
index 7f239f73e7..a95de609aa 100644
--- a/erts/emulator/test/scheduler_SUITE.erl
+++ b/erts/emulator/test/scheduler_SUITE.erl
@@ -1319,11 +1319,33 @@ scheduler_suspend_test(Config, Schedulers) ->
                                         true ->
                                             ok
                                     end,
-                                    erlang:system_info(schedulers_state)
+                                    until(fun () ->
+						  {_A, B, C} = erlang:system_info(
+								 schedulers_state),
+                                              B == C
+                                          end,
+                                          erlang:monotonic_time()
+                                          + erlang:convert_time_unit(1,
+								     seconds,
+								     native)),
+				    erlang:system_info(schedulers_state)
                             end]),
     stop_node(Node),
     ok.
-    
+
+until(Pred, MaxTime) ->
+    case Pred() of
+	true ->
+	    true;
+	false ->
+	    case erlang:monotonic_time() > MaxTime of
+		true ->
+		    false;
+		false ->
+		    receive after 100 -> ok end,
+		    until(Pred, MaxTime)
+	    end
+    end.
 
 sst0_loop(0) ->
     ok;
-- 
cgit v1.2.3