Skip to content
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.

Sign up for GitHub

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

Fix build failure and automake support #11

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Fix build failure and automake support #11

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ddacf94
Removing automake files that will be recreated during the build process
jdolinski Apr 13, 2017
1e83af5
Adding dependencies for test cases compile/linking
jdolinski Apr 13, 2017
7e844eb
Fixing linking errors in source code & tests
jdolinski Apr 13, 2017
a55aaba
Updated documentation
jdolinski Apr 13, 2017
834383b
Removing IDE files
jdolinski Apr 13, 2017
45da295
Removing IDE Files
jdolinski Apr 13, 2017
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
1 change: 0 additions & 1 deletion libmemcached-1.0/struct/include.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,5 @@ nobase_include_HEADERS+= libmemcached-1.0/struct/memcached.h
nobase_include_HEADERS+= libmemcached-1.0/struct/result.h
nobase_include_HEADERS+= libmemcached-1.0/struct/sasl.h
nobase_include_HEADERS+= libmemcached-1.0/struct/server.h
nobase_include_HEADERS+= libmemcached-1.0/struct/configuration_server.h
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dead code

nobase_include_HEADERS+= libmemcached-1.0/struct/stat.h
nobase_include_HEADERS+= libmemcached-1.0/struct/string.h
3 changes: 1 addition & 2 deletions libmemcached/include.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ noinst_HEADERS+= libmemcached/continuum.hpp
noinst_HEADERS+= libmemcached/do.hpp
noinst_HEADERS+= libmemcached/encoding_key.h
noinst_HEADERS+= libmemcached/error.hpp
noinst_HEADERS+= libmemcached/flag.hpp
noinst_HEADERS+= libmemcached/host.h
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dead code

noinst_HEADERS+= libmemcached/flag.hpp
noinst_HEADERS+= libmemcached/initialize_query.h
noinst_HEADERS+= libmemcached/instance.hpp
noinst_HEADERS+= libmemcached/internal.h
Expand Down
4 changes: 2 additions & 2 deletions tests/libmemcached-1.0/all_tests.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@

#include <algorithm>

Copy link
Author

@jdolinski jdolinski Apr 13, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The linking of the test cases and memcached files was running into the error below. I had renamed a couple methods that contained the same signature causing multiple definition errors.

CXXLD tests/libmemcached-1.0/testapp tests/libmemcached-1.0/tests_libmemcached_1_0_testapp-dynamic_mode_test.o: In functionget_world':
/usr/include/c++/4.8/sstream:129: multiple definition of get_world' tests/libmemcached-1.0/tests_libmemcached_1_0_testapp-all_tests.o:/home/ubuntu/new/aws-elasticache-cluster-client-libmemcached/BUILD/../tests/libmemcached-1.0/all_tests.cc:75: first defined here tests/libmemcached-1.0/tests_libmemcached_1_0_testapp-dynamic_mode_test.o:(.data.rel+0x0): multiple definition of collection'
tests/libmemcached-1.0/tests_libmemcached_1_0_testapp-all_tests.o:(.data.rel+0x0): first defined here
/usr/bin/ld: Warning: size of symbol collection' changed from 2272 in tests/libmemcached-1.0/tests_libmemcached_1_0_testapp-all_tests.o to 64 in tests/libmemcached-1.0/tests_libmemcached_1_0_testapp-dynamic_mode_test.o collect2: error: ld returned 1 exit status

void get_world(libtest::Framework* world)
void get_world_all(libtest::Framework* world)
{
if (getenv("LIBMEMCACHED_SERVER_NUMBER"))
{
Expand All @@ -86,7 +86,7 @@ void get_world(libtest::Framework* world)
std::min(libtest::number_of_cpus(), size_t(8)) : 3);
}

world->collections(collection);
world->collections(collections);

world->create((test_callback_create_fn*)world_create);
world->destroy((test_callback_destroy_fn*)world_destroy);
Expand Down
2 changes: 1 addition & 1 deletion tests/libmemcached-1.0/all_tests.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ test_st namespace_tests[] ={
{0, 0, (test_callback_fn*)0}
};

collection_st collection[] ={
collection_st collections[] ={
#if 0
{"hash_sanity", 0, 0, hash_sanity},
#endif
Expand Down
2 changes: 1 addition & 1 deletion tests/libmemcached-1.0/all_tests_socket.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@

void get_world(libtest::Framework* world)
{
world->collections(collection);
world->collections(collections);

world->create((test_callback_create_fn*)world_create);
world->destroy((test_callback_destroy_fn*)world_destroy);
Expand Down