From 914dcac3d235fbb22560b4a5536e12c0a9dbd246 Mon Sep 17 00:00:00 2001 From: roman_rybalko Date: Sat, 28 Jun 2008 10:38:12 +0000 Subject: [PATCH] trunk: moved to asio-1-0-0 from asio-head (get_asio & makefile fix) tests moved to "check" target --- Makefile.am | 11 --- include/Makefile.am | 202 ++++++++++++++++++-------------------------- include/get_asio.sh | 2 +- test/Makefile.am | 4 +- 4 files changed, 87 insertions(+), 132 deletions(-) diff --git a/Makefile.am b/Makefile.am index da17524f2..a8797277a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -63,14 +63,3 @@ bindings/python/src/version.cpp pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libtorrent-rasterbar.pc - -check: test - test/test_hasher \ - && test/test_bencoding \ - && test/test_ip_filter \ - && test/test_piece_picker \ - && test/test_storage \ - && test/test_buffer \ - && test/test_swarm \ - && test/test_primitives \ - && echo && echo && echo " **** all tests passed ****" && echo && echo diff --git a/include/Makefile.am b/include/Makefile.am index 125a7e639..67bae4d44 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -103,11 +103,85 @@ libtorrent/kademlia/traversal_algorithm.hpp if ENABLE_SHIPPED_ASIO nobase_include_HEADERS += \ libtorrent/asio.hpp \ +libtorrent/asio/detail/bind_handler.hpp \ +libtorrent/asio/detail/buffer_resize_guard.hpp \ +libtorrent/asio/detail/buffered_stream_storage.hpp \ +libtorrent/asio/detail/call_stack.hpp \ +libtorrent/asio/detail/const_buffers_iterator.hpp \ +libtorrent/asio/detail/consuming_buffers.hpp \ +libtorrent/asio/detail/deadline_timer_service.hpp \ +libtorrent/asio/detail/dev_poll_reactor.hpp \ +libtorrent/asio/detail/dev_poll_reactor_fwd.hpp \ +libtorrent/asio/detail/epoll_reactor.hpp \ +libtorrent/asio/detail/epoll_reactor_fwd.hpp \ +libtorrent/asio/detail/event.hpp \ +libtorrent/asio/detail/fd_set_adapter.hpp \ +libtorrent/asio/detail/handler_alloc_helpers.hpp \ +libtorrent/asio/detail/handler_invoke_helpers.hpp \ +libtorrent/asio/detail/handler_queue.hpp \ +libtorrent/asio/detail/hash_map.hpp \ +libtorrent/asio/detail/io_control.hpp \ +libtorrent/asio/detail/kqueue_reactor.hpp \ +libtorrent/asio/detail/kqueue_reactor_fwd.hpp \ +libtorrent/asio/detail/local_free_on_block_exit.hpp \ +libtorrent/asio/detail/mutex.hpp \ +libtorrent/asio/detail/noncopyable.hpp \ +libtorrent/asio/detail/null_event.hpp \ +libtorrent/asio/detail/null_mutex.hpp \ +libtorrent/asio/detail/null_signal_blocker.hpp \ +libtorrent/asio/detail/null_thread.hpp \ +libtorrent/asio/detail/null_tss_ptr.hpp \ +libtorrent/asio/detail/old_win_sdk_compat.hpp \ +libtorrent/asio/detail/pipe_select_interrupter.hpp \ +libtorrent/asio/detail/pop_options.hpp \ +libtorrent/asio/detail/posix_event.hpp \ +libtorrent/asio/detail/posix_fd_set_adapter.hpp \ +libtorrent/asio/detail/posix_mutex.hpp \ +libtorrent/asio/detail/posix_signal_blocker.hpp \ +libtorrent/asio/detail/posix_thread.hpp \ +libtorrent/asio/detail/posix_tss_ptr.hpp \ +libtorrent/asio/detail/push_options.hpp \ +libtorrent/asio/detail/reactive_socket_service.hpp \ +libtorrent/asio/detail/reactor_op_queue.hpp \ +libtorrent/asio/detail/resolver_service.hpp \ +libtorrent/asio/detail/scoped_lock.hpp \ +libtorrent/asio/detail/select_interrupter.hpp \ +libtorrent/asio/detail/select_reactor.hpp \ +libtorrent/asio/detail/select_reactor_fwd.hpp \ +libtorrent/asio/detail/service_base.hpp \ +libtorrent/asio/detail/service_id.hpp \ +libtorrent/asio/detail/service_registry.hpp \ +libtorrent/asio/detail/service_registry_fwd.hpp \ +libtorrent/asio/detail/signal_blocker.hpp \ +libtorrent/asio/detail/signal_init.hpp \ +libtorrent/asio/detail/socket_holder.hpp \ +libtorrent/asio/detail/socket_ops.hpp \ +libtorrent/asio/detail/socket_option.hpp \ +libtorrent/asio/detail/socket_select_interrupter.hpp \ +libtorrent/asio/detail/socket_types.hpp \ +libtorrent/asio/detail/strand_service.hpp \ +libtorrent/asio/detail/task_io_service.hpp \ +libtorrent/asio/detail/task_io_service_fwd.hpp \ +libtorrent/asio/detail/thread.hpp \ +libtorrent/asio/detail/throw_error.hpp \ +libtorrent/asio/detail/timer_queue.hpp \ +libtorrent/asio/detail/timer_queue_base.hpp \ +libtorrent/asio/detail/tss_ptr.hpp \ +libtorrent/asio/detail/win_event.hpp \ +libtorrent/asio/detail/win_fd_set_adapter.hpp \ +libtorrent/asio/detail/win_iocp_io_service.hpp \ +libtorrent/asio/detail/win_iocp_io_service_fwd.hpp \ +libtorrent/asio/detail/win_iocp_socket_service.hpp \ +libtorrent/asio/detail/win_mutex.hpp \ +libtorrent/asio/detail/win_signal_blocker.hpp \ +libtorrent/asio/detail/win_thread.hpp \ +libtorrent/asio/detail/win_tss_ptr.hpp \ +libtorrent/asio/detail/wince_thread.hpp \ +libtorrent/asio/detail/winsock_init.hpp \ +libtorrent/asio/detail/wrapped_handler.hpp \ libtorrent/asio/basic_datagram_socket.hpp \ libtorrent/asio/basic_deadline_timer.hpp \ libtorrent/asio/basic_io_object.hpp \ -libtorrent/asio/basic_raw_socket.hpp \ -libtorrent/asio/basic_serial_port.hpp \ libtorrent/asio/basic_socket.hpp \ libtorrent/asio/basic_socket_acceptor.hpp \ libtorrent/asio/basic_socket_iostream.hpp \ @@ -133,13 +207,8 @@ libtorrent/asio/io_service.hpp \ libtorrent/asio/is_read_buffered.hpp \ libtorrent/asio/is_write_buffered.hpp \ libtorrent/asio/placeholders.hpp \ -libtorrent/asio/raw_socket_service.hpp \ libtorrent/asio/read.hpp \ -libtorrent/asio/read_at.hpp \ libtorrent/asio/read_until.hpp \ -libtorrent/asio/serial_port.hpp \ -libtorrent/asio/serial_port_base.hpp \ -libtorrent/asio/serial_port_service.hpp \ libtorrent/asio/socket_acceptor_service.hpp \ libtorrent/asio/socket_base.hpp \ libtorrent/asio/ssl.hpp \ @@ -151,99 +220,12 @@ libtorrent/asio/thread.hpp \ libtorrent/asio/time_traits.hpp \ libtorrent/asio/version.hpp \ libtorrent/asio/write.hpp \ -libtorrent/asio/write_at.hpp \ -libtorrent/asio/detail/bind_handler.hpp \ -libtorrent/asio/detail/buffer_resize_guard.hpp \ -libtorrent/asio/detail/buffered_stream_storage.hpp \ -libtorrent/asio/detail/call_stack.hpp \ -libtorrent/asio/detail/const_buffers_iterator.hpp \ -libtorrent/asio/detail/consuming_buffers.hpp \ -libtorrent/asio/detail/deadline_timer_service.hpp \ -libtorrent/asio/detail/descriptor_ops.hpp \ -libtorrent/asio/detail/dev_poll_reactor.hpp \ -libtorrent/asio/detail/dev_poll_reactor_fwd.hpp \ -libtorrent/asio/detail/epoll_reactor.hpp \ -libtorrent/asio/detail/epoll_reactor_fwd.hpp \ -libtorrent/asio/detail/event.hpp \ -libtorrent/asio/detail/fd_set_adapter.hpp \ -libtorrent/asio/detail/handler_alloc_helpers.hpp \ -libtorrent/asio/detail/handler_base_from_member.hpp \ -libtorrent/asio/detail/handler_invoke_helpers.hpp \ -libtorrent/asio/detail/handler_queue.hpp \ -libtorrent/asio/detail/hash_map.hpp \ -libtorrent/asio/detail/indirect_handler_queue.hpp \ -libtorrent/asio/detail/io_control.hpp \ -libtorrent/asio/detail/kqueue_reactor.hpp \ -libtorrent/asio/detail/kqueue_reactor_fwd.hpp \ -libtorrent/asio/detail/local_free_on_block_exit.hpp \ -libtorrent/asio/detail/mutex.hpp \ -libtorrent/asio/detail/noncopyable.hpp \ -libtorrent/asio/detail/null_event.hpp \ -libtorrent/asio/detail/null_mutex.hpp \ -libtorrent/asio/detail/null_signal_blocker.hpp \ -libtorrent/asio/detail/null_thread.hpp \ -libtorrent/asio/detail/null_tss_ptr.hpp \ -libtorrent/asio/detail/old_win_sdk_compat.hpp \ -libtorrent/asio/detail/pipe_select_interrupter.hpp \ -libtorrent/asio/detail/pop_options.hpp \ -libtorrent/asio/detail/posix_event.hpp \ -libtorrent/asio/detail/posix_fd_set_adapter.hpp \ -libtorrent/asio/detail/posix_mutex.hpp \ -libtorrent/asio/detail/posix_signal_blocker.hpp \ -libtorrent/asio/detail/posix_thread.hpp \ -libtorrent/asio/detail/posix_tss_ptr.hpp \ -libtorrent/asio/detail/push_options.hpp \ -libtorrent/asio/detail/reactive_descriptor_service.hpp \ -libtorrent/asio/detail/reactive_serial_port_service.hpp \ -libtorrent/asio/detail/reactive_socket_service.hpp \ -libtorrent/asio/detail/reactor_op_queue.hpp \ -libtorrent/asio/detail/resolver_service.hpp \ -libtorrent/asio/detail/scoped_lock.hpp \ -libtorrent/asio/detail/select_interrupter.hpp \ -libtorrent/asio/detail/select_reactor.hpp \ -libtorrent/asio/detail/select_reactor_fwd.hpp \ -libtorrent/asio/detail/service_base.hpp \ -libtorrent/asio/detail/service_id.hpp \ -libtorrent/asio/detail/service_registry.hpp \ -libtorrent/asio/detail/service_registry_fwd.hpp \ -libtorrent/asio/detail/signal_blocker.hpp \ -libtorrent/asio/detail/signal_init.hpp \ -libtorrent/asio/detail/socket_holder.hpp \ -libtorrent/asio/detail/socket_ops.hpp \ -libtorrent/asio/detail/socket_option.hpp \ -libtorrent/asio/detail/socket_select_interrupter.hpp \ -libtorrent/asio/detail/socket_types.hpp \ -libtorrent/asio/detail/strand_service.hpp \ -libtorrent/asio/detail/task_io_service.hpp \ -libtorrent/asio/detail/task_io_service_2lock.hpp \ -libtorrent/asio/detail/task_io_service_fwd.hpp \ -libtorrent/asio/detail/thread.hpp \ -libtorrent/asio/detail/throw_error.hpp \ -libtorrent/asio/detail/timer_queue.hpp \ -libtorrent/asio/detail/timer_queue_base.hpp \ -libtorrent/asio/detail/tss_ptr.hpp \ -libtorrent/asio/detail/win_event.hpp \ -libtorrent/asio/detail/win_fd_set_adapter.hpp \ -libtorrent/asio/detail/win_iocp_handle_service.hpp \ -libtorrent/asio/detail/win_iocp_io_service.hpp \ -libtorrent/asio/detail/win_iocp_io_service_fwd.hpp \ -libtorrent/asio/detail/win_iocp_serial_port_service.hpp \ -libtorrent/asio/detail/win_iocp_socket_service.hpp \ -libtorrent/asio/detail/win_mutex.hpp \ -libtorrent/asio/detail/win_signal_blocker.hpp \ -libtorrent/asio/detail/win_thread.hpp \ -libtorrent/asio/detail/win_tss_ptr.hpp \ -libtorrent/asio/detail/wince_thread.hpp \ -libtorrent/asio/detail/winsock_init.hpp \ -libtorrent/asio/detail/wrapped_handler.hpp \ libtorrent/asio/impl/error_code.ipp \ libtorrent/asio/impl/io_service.ipp \ libtorrent/asio/impl/read.ipp \ -libtorrent/asio/impl/read_at.ipp \ libtorrent/asio/impl/read_until.ipp \ -libtorrent/asio/impl/serial_port_base.ipp \ libtorrent/asio/impl/write.ipp \ -libtorrent/asio/impl/write_at.ipp \ +libtorrent/asio/ip/detail/socket_option.hpp \ libtorrent/asio/ip/address.hpp \ libtorrent/asio/ip/address_v4.hpp \ libtorrent/asio/ip/address_v6.hpp \ @@ -253,7 +235,6 @@ libtorrent/asio/ip/basic_resolver_entry.hpp \ libtorrent/asio/ip/basic_resolver_iterator.hpp \ libtorrent/asio/ip/basic_resolver_query.hpp \ libtorrent/asio/ip/host_name.hpp \ -libtorrent/asio/ip/icmp.hpp \ libtorrent/asio/ip/multicast.hpp \ libtorrent/asio/ip/resolver_query_base.hpp \ libtorrent/asio/ip/resolver_service.hpp \ @@ -261,33 +242,16 @@ libtorrent/asio/ip/tcp.hpp \ libtorrent/asio/ip/udp.hpp \ libtorrent/asio/ip/unicast.hpp \ libtorrent/asio/ip/v6_only.hpp \ -libtorrent/asio/ip/detail/socket_option.hpp \ -libtorrent/asio/local/basic_endpoint.hpp \ -libtorrent/asio/local/connect_pair.hpp \ -libtorrent/asio/local/datagram_protocol.hpp \ -libtorrent/asio/local/stream_protocol.hpp \ -libtorrent/asio/posix/basic_descriptor.hpp \ -libtorrent/asio/posix/basic_stream_descriptor.hpp \ -libtorrent/asio/posix/descriptor_base.hpp \ -libtorrent/asio/posix/stream_descriptor.hpp \ -libtorrent/asio/posix/stream_descriptor_service.hpp \ +libtorrent/asio/ssl/detail/openssl_context_service.hpp \ +libtorrent/asio/ssl/detail/openssl_init.hpp \ +libtorrent/asio/ssl/detail/openssl_operation.hpp \ +libtorrent/asio/ssl/detail/openssl_stream_service.hpp \ +libtorrent/asio/ssl/detail/openssl_types.hpp \ libtorrent/asio/ssl/basic_context.hpp \ libtorrent/asio/ssl/context.hpp \ libtorrent/asio/ssl/context_base.hpp \ libtorrent/asio/ssl/context_service.hpp \ libtorrent/asio/ssl/stream.hpp \ libtorrent/asio/ssl/stream_base.hpp \ -libtorrent/asio/ssl/stream_service.hpp \ -libtorrent/asio/ssl/detail/openssl_context_service.hpp \ -libtorrent/asio/ssl/detail/openssl_init.hpp \ -libtorrent/asio/ssl/detail/openssl_operation.hpp \ -libtorrent/asio/ssl/detail/openssl_stream_service.hpp \ -libtorrent/asio/ssl/detail/openssl_types.hpp \ -libtorrent/asio/windows/basic_handle.hpp \ -libtorrent/asio/windows/basic_random_access_handle.hpp \ -libtorrent/asio/windows/basic_stream_handle.hpp \ -libtorrent/asio/windows/random_access_handle.hpp \ -libtorrent/asio/windows/random_access_handle_service.hpp \ -libtorrent/asio/windows/stream_handle.hpp \ -libtorrent/asio/windows/stream_handle_service.hpp +libtorrent/asio/ssl/stream_service.hpp endif diff --git a/include/get_asio.sh b/include/get_asio.sh index 05f2edaaf..4287350fe 100755 --- a/include/get_asio.sh +++ b/include/get_asio.sh @@ -8,6 +8,6 @@ set -e rm -Rf asio rm -Rf libtorrent/asio* #cvs -d :pserver:anonymous@asio.cvs.sourceforge.net:/cvsroot/asio login # uncomment this if you're the first time, use empty password -cvs -d :pserver:anonymous@asio.cvs.sourceforge.net:/cvsroot/asio export -D 'Fri, 13 Jun 2008 14:18:47 +0400' -d asio asio/include +cvs -d :pserver:anonymous@asio.cvs.sourceforge.net:/cvsroot/asio export -r asio-1-0-0 -d asio asio/include ln -s ../asio/asio libtorrent ln -s ../asio/asio.hpp libtorrent diff --git a/test/Makefile.am b/test/Makefile.am index 24eba21dd..25b34b63b 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,8 +1,10 @@ -noinst_PROGRAMS = test_hasher test_bencoding test_ip_filter test_piece_picker \ +check_PROGRAMS = test_hasher test_bencoding test_ip_filter test_piece_picker \ test_storage test_metadata_extension test_buffer test_swarm test_pe_crypto test_primitives \ test_bandwidth_limiter test_upnp test_fast_extension test_pex test_web_seed \ test_http_connection test_lsd +TESTS = $(check_PROGRAMS) + EXTRA_DIST = Jamfile test_lsd_SOURCES = main.cpp setup_transfer.cpp test_lsd.cpp