premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

attempt at fixing link issue since moving unit test code into a shared library

This commit is contained in:
Arvid Norberg 2013-06-23 03:01:02 +00:00
parent d065ed3106
commit 56648ac39b
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/Jamfile
View File

@ -11,18 +11,18 @@ rule libtorrent_dependency ( properties * )
{ {
local result ; local result ;
if <toolset>msvc in $(properties) # if <toolset>msvc in $(properties)
{ # {
# for some reason, the visual studio debugger seems # for some reason, the visual studio debugger seems
# to get very confused with the dynamic linking. # to get very confused with the dynamic linking.
# since debugging unit tests is common, just link # since debugging unit tests is common, just link
# statically with msvc # statically with msvc
result += <library>/torrent//torrent/<link>static/<boost-link>static/<export-extra>on ; # result += <library>/torrent//torrent/<link>static/<boost-link>static/<export-extra>on ;
} # }
else # else
{ # {
result += <library>/torrent//torrent/<link>shared/<boost-link>shared/<export-extra>on ; result += <library>/torrent//torrent/<link>shared/<boost-link>shared/<export-extra>on ;
} # }
return $(result) ; return $(result) ;
} }

28
test/setup_transfer.hpp
View File

@ -43,47 +43,47 @@ namespace libtorrent
struct session_status; struct session_status;
} }
std::auto_ptr<libtorrent::alert> wait_for_alert(libtorrent::session& ses, int type); std::auto_ptr<libtorrent::alert> TORRENT_EXPORT wait_for_alert(libtorrent::session& ses, int type);
void print_ses_rate(float time void TORRENT_EXPORT print_ses_rate(float time
, libtorrent::torrent_status const* st1 , libtorrent::torrent_status const* st1
, libtorrent::torrent_status const* st2 , libtorrent::torrent_status const* st2
, libtorrent::torrent_status const* st3 = NULL); , libtorrent::torrent_status const* st3 = NULL);
bool print_alerts(libtorrent::session& ses, char const* name bool TORRENT_EXPORT print_alerts(libtorrent::session& ses, char const* name
, bool allow_disconnects = false , bool allow_disconnects = false
, bool allow_no_torrents = false , bool allow_no_torrents = false
, bool allow_failed_fastresume = false , bool allow_failed_fastresume = false
, bool (*)(libtorrent::alert*) = 0 , bool (*)(libtorrent::alert*) = 0
, bool no_output = false); , bool no_output = false);
void wait_for_listen(libtorrent::session& ses, char const* name); void TORRENT_EXPORT wait_for_listen(libtorrent::session& ses, char const* name);
void test_sleep(int millisec); void TORRENT_EXPORT test_sleep(int millisec);
extern boost::detail::atomic_count g_udp_tracker_requests; extern boost::detail::atomic_count g_udp_tracker_requests;
extern boost::detail::atomic_count g_http_tracker_requests; extern boost::detail::atomic_count g_http_tracker_requests;
void create_random_files(std::string const& path, const int file_sizes[], int num_files); void TORRENT_EXPORT create_random_files(std::string const& path, const int file_sizes[], int num_files);
boost::intrusive_ptr<libtorrent::torrent_info> create_torrent(std::ostream* file = 0 boost::intrusive_ptr<libtorrent::torrent_info> TORRENT_EXPORT create_torrent(std::ostream* file = 0
, int piece_size = 16 * 1024, int num_pieces = 13, bool add_tracker = true, bool encrypted = false); , int piece_size = 16 * 1024, int num_pieces = 13, bool add_tracker = true, bool encrypted = false);
boost::tuple<libtorrent::torrent_handle boost::tuple<libtorrent::torrent_handle
, libtorrent::torrent_handle , libtorrent::torrent_handle
, libtorrent::torrent_handle> , libtorrent::torrent_handle>
setup_transfer(libtorrent::session* ses1, libtorrent::session* ses2 TORRENT_EXPORT setup_transfer(libtorrent::session* ses1, libtorrent::session* ses2
, libtorrent::session* ses3, bool clear_files, bool use_metadata_transfer = true , libtorrent::session* ses3, bool clear_files, bool use_metadata_transfer = true
, bool connect = true, std::string suffix = "", int piece_size = 16 * 1024 , bool connect = true, std::string suffix = "", int piece_size = 16 * 1024
, boost::intrusive_ptr<libtorrent::torrent_info>* torrent = 0, bool super_seeding = false , boost::intrusive_ptr<libtorrent::torrent_info>* torrent = 0, bool super_seeding = false
, libtorrent::add_torrent_params const* p = 0, bool stop_lsd = true, bool encrypted_torrent = false); , libtorrent::add_torrent_params const* p = 0, bool stop_lsd = true, bool encrypted_torrent = false);
int start_web_server(bool ssl = false, bool chunked = false); int TORRENT_EXPORT start_web_server(bool ssl = false, bool chunked = false);
void stop_web_server(); void TORRENT_EXPORT stop_web_server();
int start_proxy(int type); int TORRENT_EXPORT start_proxy(int type);
void stop_proxy(int port); void TORRENT_EXPORT stop_proxy(int port);
void stop_tracker(); void TORRENT_EXPORT stop_tracker();
int start_tracker(); int TORRENT_EXPORT start_tracker();
#endif #endif