jiigen666/libtorrent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #99 from arvidn/appveyor-upgrade

Browse Source 
appveyor upgrade
This commit is contained in:
Arvid Norberg
2015-08-20 09:33:56 +02:00
parent e59db1758b 0de5cf8adc
commit fa5b8b7140
2 changed files with 71 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

132
appveyor.yml
View File

@@ -1,62 +1,70 @@
version: 1.0.{build} version: 1.0.{build}
branches: branches:
only: only:
- master - master
os: Windows Server 2012 R2 os: Visual Studio 2015
clone_depth: 1 clone_depth: 1
environment: environment:
matrix: matrix:
- variant: test_debug - variant: test_debug
compiler: msvc compiler: msvc-12.0
linkflags: '"/LIBPATH:C:\\OpenSSL-Win32\\lib"' linkflags: '"/LIBPATH:C:\\OpenSSL-Win32\\lib"'
- variant: test_barebones - variant: test_debug
compiler: msvc compiler: msvc-10.0
linkflags: '"/LIBPATH:C:\\OpenSSL-Win32\\lib"' linkflags: '"/LIBPATH:C:\\OpenSSL-Win32\\lib"'
- variant: test_release - variant: test_debug
compiler: msvc compiler: msvc-14.0
linkflags: '"/LIBPATH:C:\\OpenSSL-Win32\\lib"' linkflags: '"/LIBPATH:C:\\OpenSSL-Win32\\lib"'
- variant: test_barebones
# mingw and boost.random don't like each other. Comment this back in once there compiler: msvc-12.0
# is support linkflags: '"/LIBPATH:C:\\OpenSSL-Win32\\lib"'
- variant: test_release
# - variant: test_debug compiler: msvc-12.0
# compiler: gcc linkflags: '"/LIBPATH:C:\\OpenSSL-Win32\\lib"'
# linkflags: '"-LC:\\OpenSSL-Win32\\lib"'
# mingw and boost.random don't like each other. Comment this back in once there
install: # is support
- git submodule update --init --recursive
- set ROOT_DIRECTORY=%CD% # - variant: test_debug
- cd %ROOT_DIRECTORY% # compiler: gcc
- if not exist c:\OpenSSL-Win32\nul ( # linkflags: '"-LC:\\OpenSSL-Win32\\lib"'
appveyor DownloadFile https://strcpy.net/packages/Win32OpenSSL-1_0_2a.exe
&& Win32OpenSSL-1_0_2a.exe /silent /verysilent /sp- /suppressmsgboxes ) install:
- copy c:\OpenSSL-Win32\ssleay32.dll %WINDIR%\system32 - git submodule update --init --recursive
- copy c:\OpenSSL-Win32\libeay32.dll %WINDIR%\system32 - set ROOT_DIRECTORY=%CD%
- cd %ROOT_DIRECTORY% - cd %ROOT_DIRECTORY%
- set BOOST_ROOT=c:\Libraries\boost - if not exist c:\OpenSSL-Win32\nul (
- set BOOST_BUILD_PATH=%BOOST_ROOT%\tools\build appveyor DownloadFile https://strcpy.net/packages/Win32OpenSSL-1_0_2a.exe
- echo %BOOST_ROOT% && Win32OpenSSL-1_0_2a.exe /silent /verysilent /sp- /suppressmsgboxes )
- echo %BOOST_BUILD_PATH% - copy c:\OpenSSL-Win32\ssleay32.dll %WINDIR%\system32
- set PATH=%PATH%;%BOOST_BUILD_PATH%\src\engine\bin.ntx86 - copy c:\OpenSSL-Win32\libeay32.dll %WINDIR%\system32
- 'echo using msvc : 12.0 ; >%HOMEDRIVE%%HOMEPATH%\user-config.jam' - cd %ROOT_DIRECTORY%
- echo using gcc ; >>%HOMEDRIVE%%HOMEPATH%\user-config.jam - set BOOST_ROOT=c:\Libraries\boost
- type %HOMEDRIVE%%HOMEPATH%\user-config.jam - set BOOST_BUILD_PATH=%BOOST_ROOT%\tools\build
- cd %ROOT_DIRECTORY% - echo %BOOST_ROOT%
- set PATH=%PATH%;c:\Mingw\bin - echo %BOOST_BUILD_PATH%
- g++ --version - set PATH=%PATH%;%BOOST_BUILD_PATH%\src\engine\bin.ntx86
- python --version - 'echo using msvc : 10.0 ; >%HOMEDRIVE%%HOMEPATH%\user-config.jam'
- echo %ROOT_DIRECTORY% - 'echo using msvc : 12.0 ; >>%HOMEDRIVE%%HOMEPATH%\user-config.jam'
cache: - 'echo using msvc : 14.0 ; >>%HOMEDRIVE%%HOMEPATH%\user-config.jam'
- C:\OpenSSL-Win32 - echo using gcc ; >>%HOMEDRIVE%%HOMEPATH%\user-config.jam
build_script: - type %HOMEDRIVE%%HOMEPATH%\user-config.jam
- cd %ROOT_DIRECTORY%\examples - cd %ROOT_DIRECTORY%
- b2.exe --hash -j2 %compiler% variant=%variant% linkflags=%linkflags% include="C:\\OpenSSL-Win32\\include" warnings=off - set PATH=%PATH%;c:\Mingw\bin
- cd %ROOT_DIRECTORY%\test - g++ --version
- b2.exe --hash -j2 win-tests %compiler% variant=%variant% link=shared linkflags=%linkflags% include="C:\\OpenSSL-Win32\\include" warnings=off - python --version
- cd %ROOT_DIRECTORY%\bindings\python - echo %ROOT_DIRECTORY%
- b2.exe --hash -j2 %compiler% variant=%variant% linkflags=%linkflags% include="C:\\OpenSSL-Win32\\include" warnings=off stage_module cache:
- python test.py - C:\OpenSSL-Win32
- if %variant% == "test_debug" ( build_script:
cd %ROOT_DIRECTORY%\simulation - cd %ROOT_DIRECTORY%\examples
&& b2.exe --hash -j2 crypto=built-in warnings=off %compiler% ) - b2.exe --hash -j2 %compiler% variant=%variant% linkflags=%linkflags% include="C:\\OpenSSL-Win32\\include" warnings=off
- cd %ROOT_DIRECTORY%\test
- b2.exe --hash -j2 win-tests %compiler% variant=%variant% link=shared linkflags=%linkflags% include="C:\\OpenSSL-Win32\\include" warnings=off
- cd %ROOT_DIRECTORY%\bindings\python
- b2.exe --hash -j2 %compiler% variant=%variant% linkflags=%linkflags% include="C:\\OpenSSL-Win32\\include" warnings=off stage_module
- python test.py
- if %variant% == "test_debug" (
cd %ROOT_DIRECTORY%\simulation
&& b2.exe --hash -j2 crypto=built-in warnings=off %compiler% )

2
test/test_direct_dht.cpp
View File

@@ -48,7 +48,7 @@ struct test_plugin : plugin
{ {
virtual void register_dht_extensions(dht_extensions_t& ext) virtual void register_dht_extensions(dht_extensions_t& ext)
{ {
ext.push_back(std::make_pair("test_good", &good_response)); ext.push_back(dht_extensions_t::value_type("test_good", &good_response));
} }
static bool good_response(udp::endpoint const& source static bool good_response(udp::endpoint const& source