From e7174d059fb6dc4be06dac56a43cf7d7c70250c7 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Thu, 23 Dec 2010 17:52:04 +0000 Subject: [PATCH] Fixed systemtap issues (I hope) and a test case compile. --- libmemcached/include.am | 3 ++- tests/mem_functions.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libmemcached/include.am b/libmemcached/include.am index c348cb3d..e318f7ed 100644 --- a/libmemcached/include.am +++ b/libmemcached/include.am @@ -161,6 +161,7 @@ endif if DTRACE_NEEDS_OBJECTS libmemcached_libmemcached_la_SOURCES += libmemcached/libmemcached_probes.d libmemcached_libmemcached_la_DEPENDENCIES += libmemcached/libmemcached_probes.o +libmemcached_libmemcached_la_LIBADD += libmemcached/libmemcached_probes.o CLEANFILES+= libmemcached/libmemcached_probes.o endif @@ -172,5 +173,5 @@ libmemcached/dtrace_probes.h: libmemcached/libmemcached_probes.d libmemcached/libmemcached_probes.o: libmemcached/libmemcached_probes.d ${libmemcached_libmemcached_la_OBJECTS} config.h .d.o: - $(DTRACE) $(DTRACEFLAGS) -o libmemcached/libmemcached_probes.o -G -s ${top_srcdir}/libmemcached/libmemcached_probes.d `grep '^pic_object' ${top_builddir}/libmemcached/*.lo | cut -f 2 -d\' | sed "s/^/${top_builddir}\/libmemcached\//"` + $(DTRACE) $(DTRACEFLAGS) -o $@ -G -s $< `grep '^pic_object' ${top_builddir}/libmemcached/*.lo | cut -f 2 -d\' | sed "s/^/${top_builddir}\/libmemcached\//"` diff --git a/tests/mem_functions.c b/tests/mem_functions.c index 06c414a8..548af16c 100644 --- a/tests/mem_functions.c +++ b/tests/mem_functions.c @@ -5437,7 +5437,7 @@ static test_return_t regression_bug_447342(memcached_st *memc) memcached_server_instance_st instance_one; memcached_server_instance_st instance_two; - if (memcached_server_count(memc) < 3 || pre_replication(memc) != MEMCACHED_SUCCESS) + if (memcached_server_count(memc) < 3 || pre_replication(memc) != TEST_SUCCESS) return TEST_SKIPPED; memcached_return_t rc; -- 2.30.2