X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Finclude.am;h=b92145e45580ab554562dde47e40c5cfe275f33d;hb=e7798c555a23889e14ed27654be97141d6383b9e;hp=6c7e83be5d8e6bd49cbc0e75a0d0da33a0d2c1d0;hpb=921fa70d5f91d895881c19502503cd4bd4bcabde;p=m6w6%2Flibmemcached diff --git a/libtest/include.am b/libtest/include.am index 6c7e83be..b92145e4 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 @@ -48,57 +32,56 @@ drd: EXTRA_DIST+= libtest/run.gdb -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/* .PHONY: distclean-libtest-check distclean-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/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/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/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/visibility.h +noinst_HEADERS+=libtest/wait.h noinst_LTLIBRARIES+= libtest/libtest.la @@ -110,6 +93,7 @@ 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 @@ -129,6 +113,7 @@ 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 @@ -204,9 +189,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 @@ -248,6 +236,9 @@ libtest_skiptest_SOURCES= libtest/skiptest.cc check_PROGRAMS+= libtest/skiptest noinst_PROGRAMS+= libtest/skiptest +test-skip: libtest/skiptest + @libtest/skiptest + libtest_wait_SOURCES= libtest_wait_SOURCES+= libtest/wait.cc libtest_wait_SOURCES+= libtest/dream.cc