diff options
| author | Fredrik Gustafsson <[email protected]> | 2012-08-10 10:58:45 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2012-08-10 10:58:45 +0200 |
| commit | f968ff87b1d6fb74237010bffa0390953337425e (patch) | |
| tree | cd31772649b8f1e599e7fbe2cf7b76b1c2dc7a7b /lib/eunit/include/eunit.hrl | |
| parent | f20c64056d2f36d1ea7b07faf2a104378f4c97ee (diff) | |
| parent | 95a78de4810ca25f7175d8eb7bb8f05e38034122 (diff) | |
| download | otp-f968ff87b1d6fb74237010bffa0390953337425e.tar.gz otp-f968ff87b1d6fb74237010bffa0390953337425e.tar.bz2 otp-f968ff87b1d6fb74237010bffa0390953337425e.zip | |
Merge branch 'rc/eunit-2.2.3/OTP-10173' into maint
* rc/eunit-2.2.3/OTP-10173:
Include fixture setup and cleanup errors in Eunit Surefire report
documentation fixes
add {test,M,F} as a better variant of {M,F} and make the latter obsolete
minor cleanup
Write chars as UTF-8 to file
detect and report bad return values from generators and instantiators
eunit_tests should not be listed in eunit.app
improved layout of error messages - stack trace before error term
bumped revision
make stack trace pruning know about the new format
Make EUnit print stacktraces with location information
Add option 'no_tty' to silent the default tty report
Diffstat (limited to 'lib/eunit/include/eunit.hrl')
| -rw-r--r-- | lib/eunit/include/eunit.hrl | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/eunit/include/eunit.hrl b/lib/eunit/include/eunit.hrl index db68d8ae60..fba840c3bd 100644 --- a/lib/eunit/include/eunit.hrl +++ b/lib/eunit/include/eunit.hrl @@ -25,11 +25,12 @@ %% will become undefined. NODEBUG also implies NOASSERT, unless testing %% is enabled. %% -%% If including this file causes TEST to be defined, then NOASSERT will -%% be undefined, even if it was previously defined and even if NODEBUG -%% is defined. If both ASSERT and NOASSERT are defined before the file -%% is included, then ASSERT takes precedence, and NOASSERT will become -%% undefined regardless of TEST. +%% Defining NOASSERT disables asserts. NODEBUG implies NOASSERT unless +%% testing is enabled. If including this file causes TEST to be defined, +%% then NOASSERT will be undefined, even if it was previously defined and +%% even if NODEBUG is defined. If both ASSERT and NOASSERT are defined +%% before the file is included, then ASSERT takes precedence, and NOASSERT +%% will become undefined regardless of TEST. %% %% After including this file, EUNIT will be defined if and only if TEST %% is defined. @@ -127,9 +128,9 @@ current_function)))). -endif. --ifdef(NOASSERT). %% The plain assert macro should be defined to do nothing if this file %% is included when debugging/testing is turned off. +-ifdef(NOASSERT). -ifndef(assert). -define(assert(BoolExpr),ok). -endif. |