summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwtc%google.com <devnull@localhost>2008-01-13 01:55:50 +0000
committerwtc%google.com <devnull@localhost>2008-01-13 01:55:50 +0000
commit7d4eaf9dbfdf36bfda93c92366061fae3739f826 (patch)
tree61819f0ca00cbf365cae13e6bc7fa7e097766ba5
parent3545c2a4102fce9ed7195183e77927a5501a04f5 (diff)
downloadnspr-hg-7d4eaf9dbfdf36bfda93c92366061fae3739f826.tar.gz
Bug 386177: _MY_Assert should call PR_Assert in both debug and optimizedNSPR_HEAD_20080113
builds so that the test program can be aborted. The patch is contributed by Slavomir Katuscak <slavomir.katuscak@sun.com>. r=wtc Modified files: cltsrv.c provider.c
-rw-r--r--pr/tests/cltsrv.c4
-rw-r--r--pr/tests/provider.c4
2 files changed, 2 insertions, 6 deletions
diff --git a/pr/tests/cltsrv.c b/pr/tests/cltsrv.c
index a4011bc4..e1f82939 100644
--- a/pr/tests/cltsrv.c
+++ b/pr/tests/cltsrv.c
@@ -214,10 +214,8 @@ PRLogModuleInfo *cltsrv_log_file = NULL;
static void _MY_Assert(const char *s, const char *file, PRIntn ln)
{
PL_PrintError(NULL);
-#if DEBUG
PR_Assert(s, file, ln);
-#endif
-} /* _MW_Assert */
+} /* _MY_Assert */
static PRBool Aborted(PRStatus rv)
{
diff --git a/pr/tests/provider.c b/pr/tests/provider.c
index 21d0d389..57fa07b0 100644
--- a/pr/tests/provider.c
+++ b/pr/tests/provider.c
@@ -216,10 +216,8 @@ PRLogModuleInfo *cltsrv_log_file = NULL;
static void _MY_Assert(const char *s, const char *file, PRIntn ln)
{
PL_PrintError(NULL);
-#if DEBUG
PR_Assert(s, file, ln);
-#endif
-} /* _MW_Assert */
+} /* _MY_Assert */
static PRBool Aborted(PRStatus rv)
{