diff options
| author | Zandra Hird <[email protected]> | 2015-06-02 12:34:38 +0200 |
|---|---|---|
| committer | Zandra Hird <[email protected]> | 2015-06-02 12:34:38 +0200 |
| commit | 2d4367f3c863e71006aed3e0076cf3cd08ca2b42 (patch) | |
| tree | cc926c9526a24ae18f9c6507cd89c0761bf13f51 /lib/eunit/include | |
| parent | 5367528299f5ea2c30923b8b19f35abac4de971a (diff) | |
| parent | d11615cf24964b45e7fc488acaa03b54cbe16af3 (diff) | |
| download | otp-2d4367f3c863e71006aed3e0076cf3cd08ca2b42.tar.gz otp-2d4367f3c863e71006aed3e0076cf3cd08ca2b42.tar.bz2 otp-2d4367f3c863e71006aed3e0076cf3cd08ca2b42.zip | |
Merge branch 'zandra/revert/saleyn/eunit'
Diffstat (limited to 'lib/eunit/include')
| -rw-r--r-- | lib/eunit/include/eunit.hrl | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/lib/eunit/include/eunit.hrl b/lib/eunit/include/eunit.hrl index 8a829396ec..53d291430d 100644 --- a/lib/eunit/include/eunit.hrl +++ b/lib/eunit/include/eunit.hrl @@ -166,26 +166,6 @@ %% This is mostly a convenience which gives more detailed reports. %% Note: Guard is a guarded pattern, and can not be used for value. -ifdef(NOASSERT). --define(assertReceive(Guard, Timeout), ok). --else. --define(assertReceive(Guard, Timeout), - begin - ((fun () -> - receive (Guard) -> ok - after Timeout -> erlang:error({assertReceive_timedout, - [{module, ?MODULE}, - {line, ?LINE}, - {pattern, (??Guard)}, - {timeout, __V}]}) - end - end)()) - end). --endif. --define(_assertReceive(Guard, Timeout), ?_test(?assertReceive(Guard, Timeout))). - -%% This is mostly a convenience which gives more detailed reports. -%% Note: Guard is a guarded pattern, and can not be used for value. --ifdef(NOASSERT). -define(assertMatch(Guard, Expr), ok). -else. -define(assertMatch(Guard, Expr), |