Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

MB-6684: Remove memcachetest module from build

Change-Id: I1064e667454221a6b258a7b25ea54ee17e2fe19e
Reviewed-on: http://review.couchbase.org/21012
Reviewed-by: Farshid Ghods <farshid@couchbase.com>
Tested-by: Farshid Ghods <farshid@couchbase.com>
  • Loading branch information...
commit 3811f5fc95c9e6000fa4a17c7fc1f3648e108fe8 1 parent ab4b74e
@bcui6611 bcui6611 authored Peter Wansch committed
Showing with 3 additions and 8 deletions.
  1. +3 −8 Makefile.top
View
11 Makefile.top
@@ -11,7 +11,6 @@ COMPONENTS := $(COMPONENTS_EXTRA) \
libvbucket \
membase-cli \
memcached \
- memcachetest \
moxi \
couchdb \
couchbase-examples \
@@ -33,7 +32,7 @@ BUILD_SIGAR := 1
endif
ifdef FOR_WINDOWS
-COMPONENTS := $(filter-out memcachetest libcouchbase, $(COMPONENTS))
+COMPONENTS := $(filter-out libcouchbase, $(COMPONENTS))
endif
BUILD_COMPONENTS := $(filter-out ns_server, $(COMPONENTS))
@@ -42,7 +41,7 @@ BUILD_COMPONENTS_EX := geocouch
MAKE_INSTALL_TARGETS := $(patsubst %, make-install-%, $(BUILD_COMPONENTS))
MAKE_INSTALL_TARGETS_EX := $(patsubst %, make-install-%, $(BUILD_COMPONENTS_EX))
-TEST_COMPONENTS := $(filter-out libconflate membase-cli memcachetest moxi, $(BUILD_COMPONENTS))
+TEST_COMPONENTS := $(filter-out libconflate membase-cli moxi, $(BUILD_COMPONENTS))
MAKE_TEST_TARGETS := $(patsubst %, make-test-%, $(TEST_COMPONENTS))
MAKE_TEST_TARGETS_EX :=
@@ -64,7 +63,7 @@ DIST_VERSION = `git describe`
DIST_MANIFEST = manifest.xml
DIST_PRODUCT = couchbase-server
DIST_COMPONENTS_EXTRA = couchbase-python-client
-DIST_COMPONENTS = $(filter-out memcachetest libcouchbase, $(COMPONENTS)) $(DIST_COMPONENTS_EXTRA)
+DIST_COMPONENTS = $(filter-out libcouchbase, $(COMPONENTS)) $(DIST_COMPONENTS_EXTRA)
dist:
for i in $(DIST_COMPONENTS); do (cd $$i && rm -f *.tar.gz && make dist || true); done
@@ -174,10 +173,6 @@ libcouchbase_EXTRA_OPTIONS := 'LDFLAGS=-L$(DESTDIR)$(PREFIX)/lib $(LDFLAGS)' \
'CPPFLAGS=-I$(DESTDIR)$(PREFIX)/include $(CPPFLAGS)'
deps-for-libcouchbase: make-install-libvbucket make-install-memcached
-memcachetest_EXTRA_MAKE_OPTIONS := 'LDFLAGS=-L$(DESTDIR)$(PREFIX)/lib $(LDFLAGS)' \
- 'CPPFLAGS=-I$(DESTDIR)$(PREFIX)/include $(CPPFLAGS)'
-deps-for-memcachetest: make-install-memcached make-install-libmemcached make-install-libvbucket
-
ep-engine_OPTIONS := $(WITH_DEBUG_FLAG) \
'LDFLAGS=-L$(DESTDIR)$(PREFIX)/lib $(LDFLAGS)' \
'CPPFLAGS=-I$(DESTDIR)$(PREFIX)/include $(CPPFLAGS)'
Please sign in to comment.
Something went wrong with that request. Please try again.