Update libtest/fedora/lion fixes

[m6w6/libmemcached] / libtest / include.am

diff --git a/libtest/include.am b/libtest/include.am
index be4f73ae49a4615eeda2f589b52462b458645b79..71b5821f54e71c7ca02e11013e76b1706b04000b 100644 (file)
--- a/libtest/include.am
+++ b/libtest/include.am
@@ -1,20 +1,40 @@
 # vim:ft=automake
-# Copyright (C) 2011 Data Differential (http://datadifferential.com/)
+# Copyright (C) 2011 Data Differential, http://datadifferential.com/
 # All rights reserved.
 #
-# Use and distribution licensed under the BSD license.  See
-# the COPYING file in the parent directory for full text.
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 3 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 # included from Top Level Makefile.am
 # All paths should be given relative to the root
 # 
 
-LIBUTEST_TMP = ${abs_top_builddir}/tests/var/tmp/
+LIBTEST_TMP = ${abs_top_builddir}/tests/var/tmp/
+
+LIBTOOL_COMMAND=$(LIBTOOL) --mode=execute
+VALGRIND_COMMAND= $(LIBTOOL_COMMAND) valgrind --error-exitcode=1 --leak-check=yes --show-reachable=yes --track-fds=yes --malloc-fill=A5 --free-fill=DE
+HELGRIND_COMMAND= $(LIBTOOL_COMMAND) valgrind --tool=helgrind --read-var-info=yes --error-exitcode=1 
+DRD_COMMAND= $(LIBTOOL_COMMAND) valgrind --tool=drd
+GDB_COMMAND= $(LIBTOOL_COMMAND) gdb -f -x libtest/run.gdb
 
-VALGRIND_COMMAND= $(LIBTOOL) --mode=execute valgrind --error-exitcode=1 --leak-check=yes --show-reachable=yes --track-fds=yes --malloc-fill=A5 --free-fill=DE
-HELGRIND_COMMAND= $(LIBTOOL) --mode=execute valgrind --tool=helgrind --read-var-info=yes --error-exitcode=1 
-DRD_COMMAND= $(LIBTOOL) --mode=execute valgrind --tool=drd
-GDB_COMMAND= $(LIBTOOL) --mode=execute gdb
+export LIBTOOL_COMMAND
+export VALGRIND_COMMAND
+export HELGRIND_COMMAND
+export DRD_COMMAND
+export GDB_COMMAND
+
+EXTRA_DIST+= libtest/run.gdb
 
 CLEANFILES+= \
             tests/var/log/* \
@@ -22,10 +42,12 @@ CLEANFILES+= \
             tests/var/tmp/*
 
 noinst_HEADERS+= \
+                libtest/blobslap_worker.h \
                 libtest/callbacks.h \
                 libtest/cmdline.h \
                 libtest/collection.h \
                 libtest/common.h \
+                libtest/comparison.hpp \
                 libtest/core.h \
                 libtest/error.h \
                 libtest/failed.h \
@@ -38,7 +60,9 @@ noinst_HEADERS+= \
                 libtest/server.h \
                 libtest/signal.h \
                 libtest/stats.h \
+                libtest/stream.h \
                 libtest/strerror.h \
+                libtest/string.hpp \
                 libtest/test.h \
                 libtest/test.hpp \
                 libtest/visibility.h \
@@ -72,32 +96,37 @@ endif
 
 if HAVE_LIBGEARMAN
 LIBTEST_LDADD+= libgearman/libgearman.la
+libtest_libtest_la_SOURCES+= libtest/blobslap_worker.cc
 libtest_libtest_la_SOURCES+= libtest/gearmand.cc
 libtest_libtest_la_SOURCES+= util/instance.cc
+libtest_libtest_la_SOURCES+= util/operation.cc
 endif
 
+libtest_tmp_dir: tests/var/log tests/var/tmp tests/var/run clearn-var
+
 clearn-var:
        @rm -f tests/var/log/*
        @rm -f tests/var/run/*
        @rm -f tests/var/tmp/*
 
+tests/var:
+       @$(mkdir_p) tests/var
 
-tests/var: tests/var/log tests/var/tmp tests/var/run clearn-var
-       $(mkdir_p) tests/var
+tests/var/log: tests/var
+       @$(mkdir_p) tests/var/log
 
-tests/var/log:
-       $(mkdir_p) tests/var/log
+tests/var/tmp: tests/var
+       @$(mkdir_p) tests/var/tmp
 
-tests/var/tmp:
-       $(mkdir_p) tests/var/tmp
+tests/var/run: tests/var
+       @$(mkdir_p) tests/var/run
 
-tests/var/run:
-       $(mkdir_p) tests/var/run
+.PHONY+= tests/var
 
 
 libtest_unittest_CFLAGS=
 libtest_unittest_LDADD= ${LIBTEST_LDADD}
-libtest_unittest_DEPENDENCIES= ${LIBTEST_LDADD}
+libtest_unittest_DEPENDENCIES= ${LIBTEST_LDADD} libtest_tmp_dir
 libtest_unittest_SOURCES= libtest/unittest.cc
 check_PROGRAMS+= libtest/unittest
 noinst_PROGRAMS+= libtest/unittest