wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #361 from lucab/lucab/autotools-check 

Fixes to run `make check`
This commit is contained in:
Arvid Norberg 2016-01-05 01:29:49 -05:00
parent 85a510d8d8 15ef71303a
commit b750f0bae5
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
test/Makefile.am
View File

@ -1,7 +1,9 @@
AUTOMAKE_OPTIONS = subdir-objects AUTOMAKE_OPTIONS = subdir-objects
benchmark_programs = \
bdecode_benchmark
test_programs = \ test_programs = \
bdecode_benchmark \
test_primitives \ test_primitives \
test_recheck \ test_recheck \
test_stat_cache \ test_stat_cache \
@ -35,11 +37,11 @@ test_programs = \
test_linked_list test_linked_list
if ENABLE_TESTS if ENABLE_TESTS
check_PROGRAMS = $(test_programs) check_PROGRAMS = $(test_programs) $(benchmark_programs)
noinst_LTLIBRARIES = libtest.la noinst_LTLIBRARIES = libtest.la
endif endif
TESTS = $(check_PROGRAMS) TESTS = $(test_programs)
EXTRA_DIST = Jamfile \ EXTRA_DIST = Jamfile \
test_torrents/base.torrent \ test_torrents/base.torrent \
@ -95,7 +97,7 @@ EXTRA_DIST = Jamfile \
zeroes.gz \ zeroes.gz \
utf8_test.txt utf8_test.txt
EXTRA_PROGRAMS = $(test_programs) EXTRA_PROGRAMS = $(test_programs) $(benchmark_programs)
noinst_HEADERS = test.hpp setup_transfer.hpp dht_server.hpp \ noinst_HEADERS = test.hpp setup_transfer.hpp dht_server.hpp \
peer_server.hpp udp_tracker.hpp web_seed_suite.hpp swarm_suite.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_priority_SOURCES = test_priority.cpp
test_auto_unchoke_SOURCES = test_auto_unchoke.cpp test_auto_unchoke_SOURCES = test_auto_unchoke.cpp
test_checking_SOURCES = test_checking.cpp test_checking_SOURCES = test_checking.cpp
test_enum_net_SOURCES = test_enum_net.cpp
test_fast_extension_SOURCES = test_fast_extension.cpp test_fast_extension_SOURCES = test_fast_extension.cpp
test_http_connection_SOURCES = test_http_connection.cpp test_http_connection_SOURCES = test_http_connection.cpp
test_lsd_SOURCES = test_lsd.cpp test_lsd_SOURCES = test_lsd.cpp

4
test/enum_if.cpp
View File

@ -42,7 +42,7 @@ int main()
io_service ios; io_service ios;
error_code ec; error_code ec;
address def_gw = get_default_gateway(ec); address def_gw = get_default_gateway(ios, ec);
if (ec) if (ec)
{ {
fprintf(stderr, "%s\n", ec.message().c_str()); 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("Default gateway: %s\n", def_gw.to_string(ec).c_str());
printf("=========== Routes ===========\n"); printf("=========== Routes ===========\n");
std::vector<ip_route> routes = enum_routes(ec); std::vector<ip_route> routes = enum_routes(ios, ec);
if (ec) if (ec)
{ {
printf("%s\n", ec.message().c_str()); printf("%s\n", ec.message().c_str());

1
test/test_lsd.cpp
View File

@ -32,6 +32,7 @@ POSSIBILITY OF SUCH DAMAGE.
#include "libtorrent/session.hpp" #include "libtorrent/session.hpp"
#include "libtorrent/session_settings.hpp" #include "libtorrent/session_settings.hpp"
#include "libtorrent/torrent_status.hpp"
#include "libtorrent/hasher.hpp" #include "libtorrent/hasher.hpp"
#include "libtorrent/thread.hpp" #include "libtorrent/thread.hpp"
#include <boost/tuple/tuple.hpp> #include <boost/tuple/tuple.hpp>