From b53422050d05bdcbc8d5fdf4b033aa3772c19bc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= <egil@erlang.org>
Date: Wed, 3 Jun 2015 11:24:39 +0200
Subject: erts: Relax trace_meta_SUITE:on_and_off_test/1

---
 erts/emulator/test/trace_meta_SUITE.erl | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'erts/emulator')

diff --git a/erts/emulator/test/trace_meta_SUITE.erl b/erts/emulator/test/trace_meta_SUITE.erl
index fcdfe99bc3..4f485af0da 100644
--- a/erts/emulator/test/trace_meta_SUITE.erl
+++ b/erts/emulator/test/trace_meta_SUITE.erl
@@ -267,9 +267,16 @@ on_and_off_test() ->
         Else2 ->
             exit({number_mismatch, {expected, N}, {got, Else2}})
     end,
-    ?NM,
+    %% ?NM,
+    %% Can't check for erlang:*/* stuff since common_test or test_server
+    %% will likely call list_to_binary in the logger. just drain any potential
+    %% message
+    ok = flush(),
     ok.
-    
+
+flush() ->
+    receive _ -> flush() after 0 -> ok end.
+
 %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 stack_grow_test() ->    
-- 
cgit v1.2.3