From 73c950b99b033b2a317bc01a52ca9cda8bd15187 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sat, 2 Jan 2016 23:23:30 +0100 Subject: [PATCH 1/3] test: fix test_lsd compilation Signed-off-by: Luca Bruno --- test/test_lsd.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/test/test_lsd.cpp b/test/test_lsd.cpp index be1a4458a..f550aec6f 100644 --- a/test/test_lsd.cpp +++ b/test/test_lsd.cpp @@ -32,6 +32,7 @@ POSSIBILITY OF SUCH DAMAGE. #include "libtorrent/session.hpp" #include "libtorrent/session_settings.hpp" +#include "libtorrent/torrent_status.hpp" #include "libtorrent/hasher.hpp" #include "libtorrent/thread.hpp" #include From 6feab20733a8abd364e7f6e0ea39fc9e1af0a684 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sat, 2 Jan 2016 23:23:14 +0100 Subject: [PATCH 2/3] test: fix enum_if compilation Signed-off-by: Luca Bruno --- test/enum_if.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/enum_if.cpp b/test/enum_if.cpp index acb7d152f..65263deb7 100644 --- a/test/enum_if.cpp +++ b/test/enum_if.cpp @@ -42,7 +42,7 @@ int main() io_service ios; error_code ec; - address def_gw = get_default_gateway(ec); + address def_gw = get_default_gateway(ios, ec); if (ec) { fprintf(stderr, "%s\n", ec.message().c_str()); @@ -52,7 +52,7 @@ int main() printf("Default gateway: %s\n", def_gw.to_string(ec).c_str()); printf("=========== Routes ===========\n"); - std::vector routes = enum_routes(ec); + std::vector routes = enum_routes(ios, ec); if (ec) { printf("%s\n", ec.message().c_str()); From 15ef71303a3669aa065457ff1b9d72e314804fe1 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sat, 2 Jan 2016 23:22:20 +0100 Subject: [PATCH 3/3] autotools: fix `make check` running Signed-off-by: Luca Bruno --- test/Makefile.am | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/test/Makefile.am b/test/Makefile.am index 04d625d49..7c0be30d5 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,7 +1,9 @@ AUTOMAKE_OPTIONS = subdir-objects +benchmark_programs = \ + bdecode_benchmark + test_programs = \ - bdecode_benchmark \ test_primitives \ test_recheck \ test_stat_cache \ @@ -35,11 +37,11 @@ test_programs = \ test_linked_list if ENABLE_TESTS -check_PROGRAMS = $(test_programs) +check_PROGRAMS = $(test_programs) $(benchmark_programs) noinst_LTLIBRARIES = libtest.la endif -TESTS = $(check_PROGRAMS) +TESTS = $(test_programs) EXTRA_DIST = Jamfile \ test_torrents/base.torrent \ @@ -95,7 +97,7 @@ EXTRA_DIST = Jamfile \ zeroes.gz \ utf8_test.txt -EXTRA_PROGRAMS = $(test_programs) +EXTRA_PROGRAMS = $(test_programs) $(benchmark_programs) noinst_HEADERS = test.hpp setup_transfer.hpp dht_server.hpp \ peer_server.hpp udp_tracker.hpp web_seed_suite.hpp swarm_suite.hpp \ @@ -167,6 +169,7 @@ test_privacy_SOURCES = test_privacy.cpp test_priority_SOURCES = test_priority.cpp test_auto_unchoke_SOURCES = test_auto_unchoke.cpp test_checking_SOURCES = test_checking.cpp +test_enum_net_SOURCES = test_enum_net.cpp test_fast_extension_SOURCES = test_fast_extension.cpp test_http_connection_SOURCES = test_http_connection.cpp test_lsd_SOURCES = test_lsd.cpp