projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
tests: honor EPIPE in kill(HUP) test
[awesomized/libmemcached]
/
libtest
/
include.am
diff --git
a/libtest/include.am
b/libtest/include.am
index 97991375fe63c342861bde3968655b708605ab66..a16154b0d7605440282c49271bf1bafe02171173 100644
(file)
--- a/
libtest/include.am
+++ b/
libtest/include.am
@@
-7,7
+7,7
@@
LIBTOOL_COMMAND= ${abs_top_builddir}/libtool --mode=execute
VALGRIND_EXEC_COMMAND= $(LIBTOOL_COMMAND) valgrind --tool=memcheck --error-exitcode=1 --leak-check=yes --track-fds=yes --malloc-fill=A5 --free-fill=DE
SGCHECK_EXEC_COMMAND= $(LIBTOOL_COMMAND) valgrind --tool=exp-sgcheck --error-exitcode=1
LIBTOOL_COMMAND= ${abs_top_builddir}/libtool --mode=execute
VALGRIND_EXEC_COMMAND= $(LIBTOOL_COMMAND) valgrind --tool=memcheck --error-exitcode=1 --leak-check=yes --track-fds=yes --malloc-fill=A5 --free-fill=DE
SGCHECK_EXEC_COMMAND= $(LIBTOOL_COMMAND) valgrind --tool=exp-sgcheck --error-exitcode=1
-VALGRIND_COMMAND=
TESTS_ENVIRONMENT
="valgrind" $(VALGRIND_EXEC_COMMAND)
+VALGRIND_COMMAND=
LOG_COMPILER
="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 --free-is-write=yes --error-exitcode=1
SGCHECK_COMMAND= $(LIBTOOL_COMMAND) valgrind --tool=exp-sgcheck --error-exitcode=1
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 --free-is-write=yes --error-exitcode=1
SGCHECK_COMMAND= $(LIBTOOL_COMMAND) valgrind --tool=exp-sgcheck --error-exitcode=1
@@
-25,22
+25,22
@@
export SGCHECK_COMMAND
export GDB_COMMAND
valgrind:
export GDB_COMMAND
valgrind:
- @echo make check
TESTS_ENVIRONMENT
="\"$(VALGRIND_EXEC_COMMAND)\""
+ @echo make check
LOG_COMPILER
="\"$(VALGRIND_EXEC_COMMAND)\""
sgcheck:
sgcheck:
- @echo make check
TESTS_ENVIRONMENT
="\"$(SGCHECK_EXEC_COMMAND)\""
+ @echo make check
LOG_COMPILER
="\"$(SGCHECK_EXEC_COMMAND)\""
valgrind-supressions:
valgrind-supressions:
- @echo make check
TESTS_ENVIRONMENT
="\"$(VALGRIND_SUPRESSION)\""
+ @echo make check
LOG_COMPILER
="\"$(VALGRIND_SUPRESSION)\""
gdb:
gdb:
- @echo make check
TESTS_ENVIRONMENT
="\"$(GDB_COMMAND)\""
+ @echo make check
LOG_COMPILER
="\"$(GDB_COMMAND)\""
helgrind:
helgrind:
- @echo make check
TESTS_ENVIRONMENT
="\"$(HELGRIND_COMMAND)\""
+ @echo make check
LOG_COMPILER
="\"$(HELGRIND_COMMAND)\""
drd:
drd:
- @echo make check
TESTS_ENVIRONMENT
="\"$(DRD_COMMAND)\""
+ @echo make check
LOG_COMPILER
="\"$(DRD_COMMAND)\""
EXTRA_DIST+= libtest/run.gdb
EXTRA_DIST+= libtest/version.h
EXTRA_DIST+= libtest/run.gdb
EXTRA_DIST+= libtest/version.h
@@
-109,18
+109,12
@@
noinst_HEADERS+= libtest/visibility.h
noinst_HEADERS+= libtest/wait.h
noinst_HEADERS+= libtest/yatl.h
noinst_HEADERS+= libtest/wait.h
noinst_HEADERS+= libtest/yatl.h
-
noinst
_LTLIBRARIES+= libtest/libtest.la
+
check
_LTLIBRARIES+= libtest/libtest.la
libtest_libtest_la_CXXFLAGS=
EXTRA_libtest_libtest_la_DEPENDENCIES=
libtest_libtest_la_LIBADD=
libtest_libtest_la_SOURCES=
libtest_libtest_la_CXXFLAGS=
EXTRA_libtest_libtest_la_DEPENDENCIES=
libtest_libtest_la_LIBADD=
libtest_libtest_la_SOURCES=
-if BUILDING_LIBMEMCACHED
-libtest_libtest_la_LIBADD+= libmemcached/libmemcached.la
-else
-libtest_libtest_la_CXXFLAGS+= @LIBMEMCACHED_CFLAGS@
-libtest_libtest_la_LIBADD+= @LIBMEMCACHED_LIB@
-endif
libtest_libtest_la_SOURCES+= libtest/alarm.cc
libtest_libtest_la_SOURCES+= libtest/binaries.cc
libtest_libtest_la_SOURCES+= libtest/alarm.cc
libtest_libtest_la_SOURCES+= libtest/binaries.cc
@@
-164,7
+158,6
@@
libtest_libtest_la_LIBADD+= @PTHREAD_LIBS@
libtest_libtest_la_LIBADD+= $(CURL_LIBS)
libtest_libtest_la_LIBADD+= @RT_LIB@
libtest_libtest_la_LIBADD+= $(CURL_LIBS)
libtest_libtest_la_LIBADD+= @RT_LIB@
-EXTRA_libtest_libtest_la_DEPENDENCIES+= libtest_tmp_dir
EXTRA_libtest_libtest_la_DEPENDENCIES+= libtest/abort
EXTRA_libtest_libtest_la_DEPENDENCIES+= libtest/wait
EXTRA_libtest_libtest_la_DEPENDENCIES+= libtest/abort
EXTRA_libtest_libtest_la_DEPENDENCIES+= libtest/wait
@@
-176,8
+169,10
@@
libtest_libtest_la_LDFLAGS=
# We are either building in tree, or with
libtest_libtest_la_SOURCES+= libtest/memcached.cc
# We are either building in tree, or with
libtest_libtest_la_SOURCES+= libtest/memcached.cc
+if HAVE_LIBDRIZZLE
libtest_libtest_la_LDFLAGS+= @LIBDRIZZLE_LDFLAGS@
libtest_libtest_la_LIBADD+= @LIBDRIZZLE_LIB@
libtest_libtest_la_LDFLAGS+= @LIBDRIZZLE_LDFLAGS@
libtest_libtest_la_LIBADD+= @LIBDRIZZLE_LIB@
+endif
libtest_libtest_la_SOURCES+= libtest/gearmand.cc
libtest_libtest_la_SOURCES+= libtest/gearmand.cc
@@
-187,8
+182,14
@@
endif
TMP_DIR := tmp_chroot/etc tmp_chroot/var/log tmp_chroot/var/tmp tmp_chroot/var/run tmp_chroot/var/drizzle
TMP_DIR := tmp_chroot/etc tmp_chroot/var/log tmp_chroot/var/tmp tmp_chroot/var/run tmp_chroot/var/drizzle
-.PHONY: libtest_tmp_dir
-libtest_tmp_dir: | $(TMP_DIR)
+BUILT_SOURCES+= $(TMP_DIR)
+BUILT_SOURCES+= tmp_chroot/support
+
+tmp_chroot/support: | tmp_chroot
+ @cp -R support tmp_chroot
+
+tmp_chroot:
+ @$(mkdir_p) $@
$(TMP_DIR):
@$(mkdir_p) $(TMP_DIR)
$(TMP_DIR):
@$(mkdir_p) $(TMP_DIR)
@@
-250,7
+251,7
@@
libtest_backtrace_SOURCES=
libtest_backtrace_LDADD=
libtest_backtrace_SOURCES+= libtest/backtrace_test.cc
libtest_backtrace_SOURCES+= libmemcached/backtrace.cc
libtest_backtrace_LDADD=
libtest_backtrace_SOURCES+= libtest/backtrace_test.cc
libtest_backtrace_SOURCES+= libmemcached/backtrace.cc
-libtest_backtrace_LDADD+= @
DL_LIB
@
+libtest_backtrace_LDADD+= @
lt_cv_dlopen_libs
@
noinst_PROGRAMS+= libtest/backtrace
test-backtrace: libtest/backtrace
@libtest/backtrace
noinst_PROGRAMS+= libtest/backtrace
test-backtrace: libtest/backtrace
@libtest/backtrace