From ee5c2b98eeb0b9e7077177db553e9411eeeabbf8 Mon Sep 17 00:00:00 2001
From: Christian Thaeter <ct@pipapo.org>
Date: Sat, 6 Jun 2009 15:23:20 +0200
Subject: [PATCH] Fix: mpool build and tests

---
 tests/15mpool.tests | 26 +++++++++-----------------
 tests/Makefile.am   |  3 ++-
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/tests/15mpool.tests b/tests/15mpool.tests
index 97efac290..487ccb7b3 100644
--- a/tests/15mpool.tests
+++ b/tests/15mpool.tests
@@ -3,44 +3,36 @@ TESTING "Memory pool tests" ./test-mpool
 TEST "init/destroy" basic <<END
 err: initialized
 err: allocated
+err: DUMP
 err: freed
+err: DUMP
 err: destroyed
 return: 0
 END
 
 
 TEST "auto destruction" destroy <<END
-return: !0
+return: 0
 END
 
 
 TEST "cluster allocation" clusters <<END
-return: !0
+return: 0
 END
 
 
-TEST "random usage" random <<END
-return: !0
+PLANNED "random usage" random <<END
+return: 0
 END
 
 
-TEST "stats" statscheck <<END
-return: !0
-END
-
-
-TEST "optimizer" optimize <<END
-return: !0
-END
-
-
-TEST "collector" collect <<END
-return: !0
+PLANNED "stats" statscheck <<END
+return: 0
 END
 
 
 TEST "reserve" reserve <<END
-return: !0
+return: 0
 END
 
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3105dd6e2..c33287932 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -37,7 +37,8 @@ test_llist_LDADD = $(NOBUGMT_LUMIERA_LIBS)                                  libl
 check_PROGRAMS += test-mpool
 test_mpool_SOURCES = $(tests_srcdir)/library/test-mpool.c
 test_mpool_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror
-test_mpool_LDADD = liblumiera.la $(NOBUGMT_LUMIERA_LIBS)     liblumieracommon.la liblumieraproc.la -ldl -lboost_program_options-mt -lboost_regex-mt
+test_mpool_LDADD = $(NOBUGMT_LUMIERA_LIBS) \
+	liblumiera.la liblumieracommon.la liblumierabackend.la liblumieraproc.la -lboost_program_options-mt -lboost_regex-mt -ldl
 
 check_PROGRAMS += test-psplay
 test_psplay_SOURCES = $(tests_srcdir)/library/test-psplay.c