diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2015-06-03 11:24:39 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2015-06-04 11:35:27 +0200 |
| commit | b53422050d05bdcbc8d5fdf4b033aa3772c19bc1 (patch) | |
| tree | e34f2a01f700942ccd3c634ad10b8b47bdf234f4 | |
| parent | 22431f529e872cd4a4a51ad68292eedc57261e56 (diff) | |
| download | otp-b53422050d05bdcbc8d5fdf4b033aa3772c19bc1.tar.gz otp-b53422050d05bdcbc8d5fdf4b033aa3772c19bc1.tar.bz2 otp-b53422050d05bdcbc8d5fdf4b033aa3772c19bc1.zip | |
erts: Relax trace_meta_SUITE:on_and_off_test/1
| -rw-r--r-- | erts/emulator/test/trace_meta_SUITE.erl | 11 |
1 files changed, 9 insertions, 2 deletions
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() -> |