diff options
| author | Björn Gustavsson <[email protected]> | 2011-12-05 12:31:38 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2011-12-05 12:31:38 +0100 |
| commit | bdc69e0c35229fe11c98c14715b040b2f0eee5aa (patch) | |
| tree | 33e9fe280bfaee82e3a5facd597a78ce6625d29b /erts/emulator | |
| parent | f667e4a47b07b07ed035073b94d699ff5fe0ba9b (diff) | |
| parent | 6e36ca17f9c36a420702c683f1e09c2b7daa58bc (diff) | |
| download | otp-bdc69e0c35229fe11c98c14715b040b2f0eee5aa.tar.gz otp-bdc69e0c35229fe11c98c14715b040b2f0eee5aa.tar.bz2 otp-bdc69e0c35229fe11c98c14715b040b2f0eee5aa.zip | |
Merge branch 'bjorn/test-cases'
* bjorn/test-cases:
lcnt_SUITE: Be kind to slow machines
crypto_SUITE: Reinstate what was "lost in translation"
fileTransferSUITE: Cope with missing/broken crypto application
sensitive_SUITE: Fix spuriously failing recv_trace/1
eprof_SUITE: Cope with fast computers and bad time measurements
cover_SUITE: Cope with missing/broken crypto application
otp_SUITE: Write log files about undefined functions and so on
Diffstat (limited to 'erts/emulator')
| -rw-r--r-- | erts/emulator/test/sensitive_SUITE.erl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/erts/emulator/test/sensitive_SUITE.erl b/erts/emulator/test/sensitive_SUITE.erl index 634df367ca..e073eab596 100644 --- a/erts/emulator/test/sensitive_SUITE.erl +++ b/erts/emulator/test/sensitive_SUITE.erl @@ -160,8 +160,7 @@ recv_trace(Config) when is_list(Config) -> ?line {messages,Messages} = process_info(Tracer, messages), [{trace,Parent,'receive',a}, {trace,Parent,'receive',{trace_delivered,_,_}}, - {trace,Parent,'receive',c}, - {trace,Parent,'receive',{trace_delivered,_,_}}] = Messages, + {trace,Parent,'receive',c}|_] = Messages, ?line unlink(Tracer), exit(Tracer, kill), ?line unlink(Sender), exit(Sender, kill), |