Skip to content

Replace libmemcached Git submodule with binary package #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/testing.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
tarantool-version: ${{ matrix.tarantool-version }}

- name: Install build requirements
run: sudo apt-get -y install libsasl2-dev libevent-dev
run: sudo apt-get -y install libsasl2-dev libevent-dev libmemcached-tools

- run: cmake .

Expand Down
4 changes: 0 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
[submodule "third_party/libmemcached"]
path = third_party/libmemcached
url = https://github.com/tarantool/libmemcached.git
branch = libmemcached-1.2-devel-bigbes
[submodule "test-run"]
path = test-run
url = https://github.com/tarantool/test-run.git
Expand Down
2 changes: 0 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,7 @@ if(NOT SMALL_FOUND)
endif()
include_directories(${SMALL_INCLUDE_DIRS})

include(cmake/BuildLibmemcached.cmake)
include(cmake/BuildMemtier.cmake)
libmemcached_build()
memtier_build()

include_directories(${CMAKE_SOURCE_DIR}/third_party)
Expand Down
24 changes: 0 additions & 24 deletions cmake/BuildLibmemcached.cmake

This file was deleted.

1 change: 0 additions & 1 deletion test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ add_dependencies(test-memcached internalso)

add_custom_target(test-memcached-capable
COMMAND ${CMAKE_SOURCE_DIR}/test/test-run.py --suite capable)
add_dependencies(test-memcached-capable libmemcached)

add_custom_target(test-memcached-bench
COMMAND ${CMAKE_SOURCE_DIR}/test/test-run.py --force --long --suite bench)
Expand Down
184 changes: 0 additions & 184 deletions test/bench/README.md

This file was deleted.

2 changes: 1 addition & 1 deletion test/capable/capable-binary.test.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
mc = MemcachedBinaryConnection("127.0.0.1", iproto.py_con.port)
mc.flush()

cmd = shlex.split('capable/memcapable -b -p %s -h %s -v' %
cmd = shlex.split('memccapable -b -p %s -h %s -v' %
(iproto.py_con.port, '127.0.0.1'))

task = Popen(cmd, stdout=PIPE, stderr=STDOUT)
Expand Down
2 changes: 1 addition & 1 deletion test/capable/capable-text.test.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
mc = MemcachedBinaryConnection("127.0.0.1", iproto.py_con.port)
mc.flush()

cmd = shlex.split('capable/memcapable -a -p %s -h %s -v' %
cmd = shlex.split('memccapable -a -p %s -h %s -v' %
(iproto.py_con.port, '127.0.0.1'))

task = Popen(cmd, stdout=PIPE, stderr=STDOUT)
Expand Down
1 change: 0 additions & 1 deletion third_party/libmemcached
Submodule libmemcached deleted from dc5b8f