fix .travis script to run simulations (#791)

fix .travis script to run simulations
This commit is contained in:
Arvid Norberg 2016-06-05 22:13:01 -04:00
parent 223f24ca27
commit cbeb7adbde
3 changed files with 5 additions and 3 deletions

View File

@ -128,7 +128,7 @@ script:
# simulation # simulation
- cd simulation - cd simulation
- 'if [ "$variant" != "" && "$sim" == "1" ]; then - 'if [[ "$variant" != "" && "$sim" == "1" ]]; then
bjam -j2 crypto=built-in warnings-as-errors=on $toolset; bjam -j2 crypto=built-in warnings-as-errors=on $toolset;
fi' fi'
- cd .. - cd ..

@ -1 +1 @@
Subproject commit ea3bffe3c53bca5e0976914ea951193ba43fbed6 Subproject commit f0e42435dce3ff227cc81b17ccab143b21d8f771

View File

@ -103,6 +103,7 @@ const unsigned long siocgifmtu = SIOCGIFMTU;
namespace libtorrent { namespace namespace libtorrent { namespace
{ {
#if !defined TORRENT_BUILD_SIMULATOR
address inaddr_to_address(in_addr const* ina, int len = 4) address inaddr_to_address(in_addr const* ina, int len = 4)
{ {
typedef boost::asio::ip::address_v4::bytes_type bytes_t; typedef boost::asio::ip::address_v4::bytes_type bytes_t;
@ -231,7 +232,8 @@ namespace libtorrent { namespace
// } // }
return true; return true;
} }
#endif #endif // TORRENT_USE_NETLINK
#endif // !BUILD_SIMULATOR
#if TORRENT_USE_SYSCTL && !defined TORRENT_BUILD_SIMULATOR #if TORRENT_USE_SYSCTL && !defined TORRENT_BUILD_SIMULATOR
#ifdef TORRENT_OS2 #ifdef TORRENT_OS2