A setup of an option of dmalloc was added.

diff --git a/src/tools/ccunit_makeSuite.c b/src/tools/ccunit_makeSuite.c
index f4f376d..59d60e8 100644 (file)
--- a/src/tools/ccunit_makeSuite.c
+++ b/src/tools/ccunit_makeSuite.c
@@ -44,7 +44,25 @@
  */
 int main (int ac, char** av)
 {
-  return ccunit_makeSuite (ac, av);
+  int rc;
+#if CCUNIT_WITH_DMALLOC
+  dmalloc_debug_setup ("log-stats,"
+                      "log-non-free,"
+                      "log-bad-space,"
+                      "log-elapsed-time,"
+                      "check-fence,"
+                      "free-blank,"
+                      "error-abort,"
+                      "alloc-blank,"
+                      "catch-null,"
+                      "inter=100,"
+                      "log=dm-makeSuite.log");
+#endif
+  rc = ccunit_makeSuite (ac, av);
+#if CCUNIT_WITH_DMALLOC && !CCUNIT_HAVE_ATEXIT && !CCUNIT_HAVE_ONEXIT
+  dmalloc_shutdown ();
+#endif
+  return rc;
 }
 
 /** @} */

diff --git a/tests/runFailure.c b/tests/runFailure.c
index cb3a99d..d04e794 100644 (file)
--- a/tests/runFailure.c
+++ b/tests/runFailure.c
@@ -28,14 +28,25 @@ int main ()
   CCUnitTestSuite* suite;
   size_t fails;
 #if CCUNIT_WITH_DMALLOC
-#endif
+  dmalloc_debug_setup ("log-stats,"
+                      "log-non-free,"
+                      "log-bad-space,"
+                      "log-elapsed-time,"
+                      "check-fence,"
+                      "free-blank,"
+                      "error-abort,"
+                      "alloc-blank,"
+                      "catch-null,"
+                      "inter=100,"
+                      "log=dm-runFailure.log");
+#endif /* CCUNIT_WITH_DMALLOC */
   runner = ccunit_newTestRunner (NULL);
   suite = ccunit_suite ("failure");
   ccunit_runTestRunner (runner, suite);
   fails = ccunit_failureCount (runner->result);
   ccunit_deleteTestRunner (runner);
   ccunit_deleteTestSuite (suite);
-#if CCUNIT_WITH_DMALLOC
+#if CCUNIT_WITH_DMALLOC && !CCUNIT_HAVE_ATEXIT && !CCUNIT_HAVE_ONEXIT
   dmalloc_shutdown ();
 #endif
   return (int)fails;

diff --git a/tests/runSuccess.c b/tests/runSuccess.c
index 7ee5fe8..859e947 100644 (file)
--- a/tests/runSuccess.c
+++ b/tests/runSuccess.c
@@ -24,13 +24,29 @@
 
 int main ()
 {
-  CCUnitTestRunner* runner = ccunit_newTestRunner (NULL);
-  CCUnitTestSuite* suite = ccunit_suite ("success");
+  CCUnitTestRunner* runner;
+  CCUnitTestSuite* suite;
+  size_t fails;
+#if CCUNIT_WITH_DMALLOC
+  dmalloc_debug_setup ("log-stats,"
+                      "log-non-free,"
+                      "log-bad-space,"
+                      "log-elapsed-time,"
+                      "check-fence,"
+                      "free-blank,"
+                      "error-abort,"
+                      "alloc-blank,"
+                      "catch-null,"
+                      "inter=100,"
+                      "log=dm-runSuccess.log");
+#endif
+  runner = ccunit_newTestRunner (NULL);
+  suite = ccunit_suite ("success");
   ccunit_runTestRunner (runner, suite);
-  size_t fails = ccunit_failureCount (runner->result);
+  fails = ccunit_failureCount (runner->result);
   ccunit_deleteTestRunner (runner);
   ccunit_deleteTestSuite (suite);
-#if CCUNIT_WITH_DMALLOC
+#if CCUNIT_WITH_DMALLOC && !CCUNIT_HAVE_ATEXIT && !CCUNIT_HAVE_ONEXIT
   dmalloc_shutdown ();
 #endif
   return (int)fails;