aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2016-09-15 09:58:31 +0200
committerBjörn Gustavsson <[email protected]>2016-09-15 09:58:31 +0200
commitcebef1207eca1cdc8c601b172988a74fd0858efa (patch)
tree404d16cb9d61e33745835999f6395b03bec899db /lib
parent075e0a3ab1a0282fc0f9a1a9a8cd7ce96ab9fba3 (diff)
parent6a3f0814ca24ebf01be174fd89500007506f104f (diff)
downloadotp-cebef1207eca1cdc8c601b172988a74fd0858efa.tar.gz
otp-cebef1207eca1cdc8c601b172988a74fd0858efa.tar.bz2
otp-cebef1207eca1cdc8c601b172988a74fd0858efa.zip
Merge branch 'richarl/eunit/fix-asserts/PR-1168/OTP-13892' into maint
* richarl/eunit/fix-asserts/PR-1168/OTP-13892: Ensure asserts are enabled in eunit.hrl
Diffstat (limited to 'lib')
-rw-r--r--lib/eunit/include/eunit.hrl4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/eunit/include/eunit.hrl b/lib/eunit/include/eunit.hrl
index 7fd6c206a4..8a4cad1e7e 100644
--- a/lib/eunit/include/eunit.hrl
+++ b/lib/eunit/include/eunit.hrl
@@ -51,7 +51,9 @@
%% note that the main switch used within this file is NOTEST; however,
%% both TEST and EUNIT may be used to check whether testing is enabled
-ifndef(NOTEST).
--undef(NOASSERT). % testing requires that assertions are enabled
+-ifndef(ASSERT).
+-define(ASSERT, true). % testing requires that assertions are enabled
+-endif.
-ifndef(TEST).
-define(TEST, true).
-endif.