X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Finclude.am;h=3fb592b6ee6a00dacd2dc6c44a78ce2b7bc07073;hb=1f3d43109ef752862093f8e4340fcfec1832b3be;hp=58c7eb495e4ad67af923fef4272c5105ddce12d1;hpb=7933fa8f9217d7e744876773a4033b3cda4c3c16;p=awesomized%2Flibmemcached diff --git a/libtest/include.am b/libtest/include.am index 58c7eb49..3fb592b6 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 @@ -25,6 +9,7 @@ VALGRIND_EXEC_COMMAND= $(LIBTOOL_COMMAND) valgrind --error-exitcode=1 --leak-che VALGRIND_COMMAND= TESTS_ENVIRONMENT="valgrind" $(VALGRIND_EXEC_COMMAND) HELGRIND_COMMAND= $(LIBTOOL_COMMAND) valgrind --tool=helgrind --read-var-info=yes --error-exitcode=1 --read-var-info=yes DRD_COMMAND= $(LIBTOOL_COMMAND) valgrind --tool=drd +MASSIF_COMMAND= $(LIBTOOL_COMMAND) valgrind --tool=massif GDB_COMMAND= $(LIBTOOL_COMMAND) gdb -f -x libtest/run.gdb PTRCHECK_COMMAND= $(LIBTOOL_COMMAND) valgrind --tool=exp-ptrcheck --error-exitcode=1 @@ -47,58 +32,67 @@ drd: @echo make check TESTS_ENVIRONMENT="\"$(DRD_COMMAND)\"" EXTRA_DIST+= libtest/run.gdb +EXTRA_DIST+= libtest/version.h -CLEANFILES+= \ - tmp_chroot/var/drizzle/* \ - tmp_chroot/var/log/* \ - tmp_chroot/var/run/* \ - tmp_chroot/var/tmp/* +CLEANFILES+= tmp_chroot/etc/* +CLEANFILES+= tmp_chroot/var/drizzle/* +CLEANFILES+= tmp_chroot/var/log/* +CLEANFILES+= tmp_chroot/var/run/* +CLEANFILES+= tmp_chroot/var/tmp/* +CLEANFILES+= tmp_chroot/*.xml -.PHONY: distclean-libtest-check -distclean-libtest-check: +BUILT_SOURCES+= libtest/version.h + +.PHONY: clean-libtest-check +clean-libtest-check: -rm -rf tmp_chroot -noinst_HEADERS+= \ - libtest/binaries.h \ - libtest/cpu.hpp \ - libtest/blobslap_worker.h \ - libtest/callbacks.h \ - libtest/cmdline.h \ - libtest/collection.h \ - libtest/common.h \ - libtest/comparison.hpp \ - libtest/core.h \ - libtest/dream.h \ - libtest/error.h \ - libtest/failed.h \ - libtest/fatal.hpp \ - libtest/framework.h \ - libtest/gearmand.h \ - libtest/drizzled.h \ - libtest/get.h \ - libtest/has.hpp \ - libtest/http.hpp \ - libtest/is_pid.hpp \ - libtest/is_local.hpp \ - libtest/killpid.h \ - libtest/libtool.hpp \ - libtest/memcached.h \ - libtest/port.h \ - libtest/runner.h \ - libtest/server.h \ - libtest/server_container.h \ - libtest/signal.h \ - libtest/socket.hpp \ - libtest/stats.h \ - libtest/stream.h \ - libtest/strerror.h \ - libtest/string.hpp \ - libtest/test.h \ - libtest/test.hpp \ - libtest/tmpfile.hpp \ - libtest/vchar.hpp \ - libtest/visibility.h \ - libtest/wait.h + +noinst_HEADERS+= libtest/formatter.hpp +noinst_HEADERS+= libtest/timer.hpp +noinst_HEADERS+= libtest/binaries.h +noinst_HEADERS+= libtest/cpu.hpp +noinst_HEADERS+= libtest/blobslap_worker.h +noinst_HEADERS+= libtest/callbacks.h +noinst_HEADERS+= libtest/dns.hpp +noinst_HEADERS+= libtest/cmdline.h +noinst_HEADERS+= libtest/collection.h +noinst_HEADERS+= libtest/common.h +noinst_HEADERS+= libtest/comparison.hpp +noinst_HEADERS+= libtest/core.h +noinst_HEADERS+= libtest/dream.h +noinst_HEADERS+= libtest/error.h +noinst_HEADERS+= libtest/failed.h +noinst_HEADERS+= libtest/fatal.hpp +noinst_HEADERS+= libtest/framework.h +noinst_HEADERS+= libtest/gearmand.h +noinst_HEADERS+= libtest/drizzled.h +noinst_HEADERS+= libtest/get.h +noinst_HEADERS+= libtest/has.hpp +noinst_HEADERS+= libtest/http.hpp +noinst_HEADERS+= libtest/is_pid.hpp +noinst_HEADERS+= libtest/is_local.hpp +noinst_HEADERS+= libtest/killpid.h +noinst_HEADERS+= libtest/libtool.hpp +noinst_HEADERS+= libtest/memcached.h +noinst_HEADERS+= libtest/memcached.hpp +noinst_HEADERS+= libtest/poll_error.hpp +noinst_HEADERS+= libtest/port.h +noinst_HEADERS+= libtest/runner.h +noinst_HEADERS+= libtest/server.h +noinst_HEADERS+= libtest/server_container.h +noinst_HEADERS+= libtest/signal.h +noinst_HEADERS+= libtest/socket.hpp +noinst_HEADERS+= libtest/stream.h +noinst_HEADERS+= libtest/strerror.h +noinst_HEADERS+= libtest/string.hpp +noinst_HEADERS+= libtest/test.h +noinst_HEADERS+= libtest/test.hpp +noinst_HEADERS+= libtest/tmpfile.hpp +noinst_HEADERS+= libtest/vchar.hpp +noinst_HEADERS+= libtest/version.h +noinst_HEADERS+= libtest/visibility.h +noinst_HEADERS+= libtest/wait.h noinst_LTLIBRARIES+= libtest/libtest.la @@ -108,12 +102,15 @@ libtest_libtest_la_LIBADD= libtest_libtest_la_SOURCES= libtest_libtest_la_SOURCES+= libtest/binaries.cc +libtest_libtest_la_SOURCES+= libtest/dns.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/formatter.cc libtest_libtest_la_SOURCES+= libtest/framework.cc libtest_libtest_la_SOURCES+= libtest/has.cc libtest_libtest_la_SOURCES+= libtest/drizzled.cc @@ -129,10 +126,10 @@ 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/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\"" @@ -140,6 +137,7 @@ libtest_libtest_la_CXXFLAGS+= $(CURL_CFLAGS) libtest_libtest_la_LIBADD+= $(PTHREAD_LIBS) libtest_libtest_la_LIBADD+= $(CURL_LIBS) +libtest_libtest_la_LIBADD+= $(RT_LIB) libtest_libtest_la_DEPENDENCIES+= libtest_tmp_dir libtest_libtest_la_DEPENDENCIES+=libtest/abort @@ -205,9 +203,12 @@ endif libtest_tmp_dir: tmp_chroot/var/log tmp_chroot/var/tmp tmp_chroot/var/run tmp_chroot/var/drizzle -tmp_chroot: +tmp_chroot: tmp_chroot/etc @$(mkdir_p) tmp_chroot +tmp_chroot/etc: + @$(mkdir_p) tmp_chroot/etc + tmp_chroot/var: tmp_chroot @$(mkdir_p) tmp_chroot/var @@ -233,7 +234,7 @@ test-unittest: libtest/unittest @libtest/unittest valgrind-unittest: libtest/unittest - @$(VALGRIND_COMMAND) libtest/unittest TESTS_ENVIRONMENT="valgrind" + @$(VALGRIND_COMMAND) libtest/unittest gdb-unittest: libtest/unittest @$(GDB_COMMAND) libtest/unittest