summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Trawick <trawick@apache.org>2013-10-10 20:50:08 +0000
committerJeff Trawick <trawick@apache.org>2013-10-10 20:50:08 +0000
commitf18336351cafdfa8ec390e902da23cd4e845b930 (patch)
tree2d800d8aa20f74d7cd99c6583364fe30646c36a0
parent490f09ca535930080a3ad5c81968d61db537cb89 (diff)
downloadapr-f18336351cafdfa8ec390e902da23cd4e845b930.tar.gz
Merge r1523479 from trunk (but testpass is in APR-Util):
assert() games: testmutexscope relies on assert() to check as well as to run at all, so make sure NDEBUG isn't defined. testpass and teststr don't use assert(), so don't include <assert.h>. git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.5.x@1531104 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--test/testmutexscope.c2
-rw-r--r--test/teststr.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/test/testmutexscope.c b/test/testmutexscope.c
index 5318a27c3..57fcaf5aa 100644
--- a/test/testmutexscope.c
+++ b/test/testmutexscope.c
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+/* This program won't run or check correctly if assert() is disabled. */
+#undef NDEBUG
#include <assert.h>
#include <errno.h>
#include <stdio.h>
diff --git a/test/teststr.c b/test/teststr.c
index b682841de..1f748d6f2 100644
--- a/test/teststr.c
+++ b/test/teststr.c
@@ -16,7 +16,6 @@
#include "testutil.h"
-#include <assert.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>