X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Finclude.am;h=7e9be22da54672e5814bb197dc304a9bbec4ab4a;hb=1be0350e7ae7a566896a9fe52863dcc22433fc8a;hp=59706ad8aaf30e8629f767b40b96272e27dc188f;hpb=56bc4a66fa7a42de8ff9b7220f263ef756202845;p=m6w6%2Flibmemcached

diff --git a/libtest/include.am b/libtest/include.am
index 59706ad8..7e9be22d 100644
--- a/libtest/include.am
+++ b/libtest/include.am
@@ -1,20 +1,4 @@
 # vim:ft=automake
-# Copyright (C) 2011 Data Differential, http://datadifferential.com/
-# All rights reserved.
-#
-# 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
@@ -49,6 +33,7 @@ drd:
 EXTRA_DIST+= libtest/run.gdb
 
 CLEANFILES+= \
+	     tmp_chroot/var/drizzle/* \
 	     tmp_chroot/var/log/* \
 	     tmp_chroot/var/run/* \
 	     tmp_chroot/var/tmp/*
@@ -57,6 +42,7 @@ CLEANFILES+= \
 distclean-libtest-check:
 	-rm -rf tmp_chroot
 
+noinst_HEADERS+= libtest/timer.hpp
 noinst_HEADERS+= \
 		 libtest/binaries.h \
 		 libtest/cpu.hpp \
@@ -73,6 +59,7 @@ noinst_HEADERS+= \
 		 libtest/fatal.hpp \
 		 libtest/framework.h \
 		 libtest/gearmand.h \
+		 libtest/drizzled.h \
 		 libtest/get.h \
 		 libtest/has.hpp \
 		 libtest/http.hpp \
@@ -87,7 +74,6 @@ noinst_HEADERS+= \
 		 libtest/server_container.h \
 		 libtest/signal.h \
 		 libtest/socket.hpp \
-		 libtest/stats.h \
 		 libtest/stream.h \
 		 libtest/strerror.h \
 		 libtest/string.hpp \
@@ -99,36 +85,40 @@ noinst_HEADERS+= \
 		 libtest/wait.h
 
 noinst_LTLIBRARIES+= libtest/libtest.la
-libtest_libtest_la_SOURCES= \
-			    libtest/binaries.cc \
-			    libtest/cmdline.cc \
-			    libtest/comparison.cc \
-			    libtest/core.cc \
-			    libtest/cpu.cc \
-			    libtest/dream.cc \
-			    libtest/fatal.cc \
-			    libtest/framework.cc \
-			    libtest/has.cc \
-			    libtest/http.cc \
-			    libtest/is_local.cc \
-			    libtest/killpid.cc \
-			    libtest/libtool.cc \
-			    libtest/port.cc \
-			    libtest/runner.cc \
-			    libtest/server.cc \
-			    libtest/server_container.cc \
-			    libtest/signal.cc \
-			    libtest/socket.cc \
-			    libtest/strerror.cc \
-			    libtest/test.cc \
-			    libtest/tmpfile.cc \
-			    libtest/vchar.cc
 
 libtest_libtest_la_CXXFLAGS=
 libtest_libtest_la_DEPENDENCIES=
 libtest_libtest_la_LIBADD=
+libtest_libtest_la_SOURCES=
+
+libtest_libtest_la_SOURCES+= libtest/binaries.cc 
+libtest_libtest_la_SOURCES+= libtest/cmdline.cc 
+libtest_libtest_la_SOURCES+= libtest/comparison.cc 
+libtest_libtest_la_SOURCES+= libtest/collection.cc 
+libtest_libtest_la_SOURCES+= libtest/core.cc 
+libtest_libtest_la_SOURCES+= libtest/cpu.cc 
+libtest_libtest_la_SOURCES+= libtest/dream.cc 
+libtest_libtest_la_SOURCES+= libtest/fatal.cc 
+libtest_libtest_la_SOURCES+= libtest/framework.cc 
+libtest_libtest_la_SOURCES+= libtest/has.cc 
+libtest_libtest_la_SOURCES+= libtest/drizzled.cc 
+libtest_libtest_la_SOURCES+= libtest/http.cc 
+libtest_libtest_la_SOURCES+= libtest/is_local.cc 
+libtest_libtest_la_SOURCES+= libtest/killpid.cc 
+libtest_libtest_la_SOURCES+= libtest/libtool.cc 
+libtest_libtest_la_SOURCES+= libtest/main.cc 
+libtest_libtest_la_SOURCES+= libtest/port.cc 
+libtest_libtest_la_SOURCES+= libtest/runner.cc 
+libtest_libtest_la_SOURCES+= libtest/server.cc 
+libtest_libtest_la_SOURCES+= libtest/server_container.cc 
+libtest_libtest_la_SOURCES+= libtest/signal.cc 
+libtest_libtest_la_SOURCES+= libtest/socket.cc 
+libtest_libtest_la_SOURCES+= libtest/stream.cc 
+libtest_libtest_la_SOURCES+= libtest/strerror.cc 
+libtest_libtest_la_SOURCES+= libtest/timer.cc 
+libtest_libtest_la_SOURCES+= libtest/tmpfile.cc 
+libtest_libtest_la_SOURCES+= libtest/vchar.cc
 
-libtest_libtest_la_CXXFLAGS+= ${NO_CONVERSION}
 libtest_libtest_la_CXXFLAGS+= -DBUILDING_LIBTEST
 libtest_libtest_la_CXXFLAGS+= $(PTHREAD_CFLAGS)
 libtest_libtest_la_CXXFLAGS+= -DLIBTEST_TEMP="\"tmp_chroot\""
@@ -170,6 +160,13 @@ libtest_unittest_CXXFLAGS+= -DHAVE_LIBMEMCACHED=0
 endif
 endif
 
+if HAVE_LIBDRIZZLE
+
+libtest_libtest_la_LIBADD+= $(libdrizzle_LIBS)
+libtest_libtest_la_CXXFLAGS+= $(libdrizzle_CFLAGS)
+
+endif
+
 if BUILDING_GEARMAN
 libtest_libtest_la_DEPENDENCIES+= libgearman/libgearman.la
 libtest_libtest_la_LIBADD+= libgearman/libgearman.la
@@ -192,7 +189,7 @@ libtest_libtest_la_SOURCES+= util/operation.cc
 endif
 endif
 
-libtest_tmp_dir: tmp_chroot/var/log tmp_chroot/var/tmp tmp_chroot/var/run
+libtest_tmp_dir: tmp_chroot/var/log tmp_chroot/var/tmp tmp_chroot/var/run tmp_chroot/var/drizzle
 
 tmp_chroot:
 	@$(mkdir_p) tmp_chroot
@@ -206,6 +203,9 @@ tmp_chroot/var/log: tmp_chroot/var
 tmp_chroot/var/tmp: tmp_chroot/var
 	@$(mkdir_p) tmp_chroot/var/tmp
 
+tmp_chroot/var/drizzle: tmp_chroot/var
+	@$(mkdir_p) tmp_chroot/var/drizzle
+
 tmp_chroot/var/run: tmp_chroot/var
 	@$(mkdir_p) tmp_chroot/var/run