svn commit: r1531104 - in /apr/apr/branches/1.5.x: ./ test/testmutexscope.c test/teststr.c

[tr...@apache.org]

Author: trawick
Date: Thu Oct 10 20:50:08 2013
New Revision: 1531104

URL: http://svn.apache.org/r1531104
Log:
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>.


Modified:
    apr/apr/branches/1.5.x/   (props changed)
    apr/apr/branches/1.5.x/test/testmutexscope.c
    apr/apr/branches/1.5.x/test/teststr.c

Propchange: apr/apr/branches/1.5.x/
------------------------------------------------------------------------------
  Merged /apr/apr/trunk:r1523479

Modified: apr/apr/branches/1.5.x/test/testmutexscope.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/test/testmutexscope.c?rev=1531104&r1=1531103&r2=1531104&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/test/testmutexscope.c (original)
+++ apr/apr/branches/1.5.x/test/testmutexscope.c Thu Oct 10 20:50:08 2013
@@ -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>

Modified: apr/apr/branches/1.5.x/test/teststr.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/test/teststr.c?rev=1531104&r1=1531103&r2=1531104&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/test/teststr.c (original)
+++ apr/apr/branches/1.5.x/test/teststr.c Thu Oct 10 20:50:08 2013
@@ -16,7 +16,6 @@
 
 #include "testutil.h"
 
-#include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>