Loading .travis.yml +0 −2 Original line number Diff line number Diff line Loading @@ -11,8 +11,6 @@ env: - FEATURES="tlsv1_2 tlsv1_1 dtlsv1 dtlsv1_2 sslv2 aes_xts npn alpn aes_ctr" before_install: - (test $TRAVIS_OS_NAME == "osx" || ./openssl/test/build.sh) before_script: - ./openssl/test/test.sh script: - (test $TRAVIS_OS_NAME != "osx" || (cd openssl && cargo test)) - (test $TRAVIS_OS_NAME == "osx" || (cd openssl && OPENSSL_LIB_DIR=/usr/lib OPENSSL_INCLUDE_DIR=/usr/include LD_LIBRARY_PATH=/usr/lib:$LD_LIBRARY_PATH cargo test)) Loading README.md +0 −14 Original line number Diff line number Diff line Loading @@ -64,18 +64,4 @@ The build script can be configured via environment variables: If either `OPENSSL_LIB_DIR` or `OPENSSL_INCLUDE_DIR` are specified, then the build script will skip the pkg-config step. ## Testing Several tests expect a local test server to be running to bounce requests off of. It's easy to do this. Open a separate terminal window and `cd` to the rust-openssl directory. Then run one of the following command: ```bash ./openssl/test/test.sh ``` This will boot a bunch of `openssl s_server` processes that the tests connect to. Then in the original terminal, run `cargo test`. If everything is set up correctly, all tests should pass. You can stop the servers with `killall openssl`. [1]: http://slproweb.com/products/Win32OpenSSL.html appveyor.yml 0 → 100644 +25 −0 Original line number Diff line number Diff line environment: OPENSSL_INCLUDE_DIR: C:\OpenSSL\include OPENSSL_LIB_DIR: C:\OpenSSL\lib OPENSSL_LIBS: ssleay32:libeay32 matrix: - TARGET: i686-pc-windows-gnu BITS: 32 - TARGET: x86_64-pc-windows-msvc BITS: 64 install: - ps: Start-FileDownload "http://slproweb.com/download/Win${env:BITS}OpenSSL-1_0_2d.exe" - Win%BITS%OpenSSL-1_0_2d.exe /SILENT /VERYSILENT /SP- /DIR="C:\OpenSSL" - ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-nightly-${env:TARGET}.exe" - rust-nightly-%TARGET%.exe /VERYSILENT /NORESTART /DIR="C:\Program Files (x86)\Rust" - SET PATH=%PATH%;C:\Program Files (x86)\Rust\bin - SET PATH=%PATH%;C:\MinGW\bin - rustc -V - cargo -V build: false # Don't run doctests due to rust-lang/cargo#1592 test_script: - cargo test --lib --manifest-path openssl/Cargo.toml openssl/Cargo.toml +1 −3 Original line number Diff line number Diff line Loading @@ -32,6 +32,4 @@ libc = "0.1" [dev-dependencies] rustc-serialize = "0.3" [dev-dependencies.connected_socket] connected_socket = "0.0.1" net2 = "0.2.13" openssl/src/lib.rs +1 −2 Original line number Diff line number Diff line Loading @@ -11,8 +11,7 @@ extern crate openssl_sys as ffi; extern crate rustc_serialize as serialize; #[cfg(test)] #[cfg(any(feature="dtlsv1", feature="dtlsv1_2"))] extern crate connected_socket; extern crate net2; mod macros; Loading Loading
.travis.yml +0 −2 Original line number Diff line number Diff line Loading @@ -11,8 +11,6 @@ env: - FEATURES="tlsv1_2 tlsv1_1 dtlsv1 dtlsv1_2 sslv2 aes_xts npn alpn aes_ctr" before_install: - (test $TRAVIS_OS_NAME == "osx" || ./openssl/test/build.sh) before_script: - ./openssl/test/test.sh script: - (test $TRAVIS_OS_NAME != "osx" || (cd openssl && cargo test)) - (test $TRAVIS_OS_NAME == "osx" || (cd openssl && OPENSSL_LIB_DIR=/usr/lib OPENSSL_INCLUDE_DIR=/usr/include LD_LIBRARY_PATH=/usr/lib:$LD_LIBRARY_PATH cargo test)) Loading
README.md +0 −14 Original line number Diff line number Diff line Loading @@ -64,18 +64,4 @@ The build script can be configured via environment variables: If either `OPENSSL_LIB_DIR` or `OPENSSL_INCLUDE_DIR` are specified, then the build script will skip the pkg-config step. ## Testing Several tests expect a local test server to be running to bounce requests off of. It's easy to do this. Open a separate terminal window and `cd` to the rust-openssl directory. Then run one of the following command: ```bash ./openssl/test/test.sh ``` This will boot a bunch of `openssl s_server` processes that the tests connect to. Then in the original terminal, run `cargo test`. If everything is set up correctly, all tests should pass. You can stop the servers with `killall openssl`. [1]: http://slproweb.com/products/Win32OpenSSL.html
appveyor.yml 0 → 100644 +25 −0 Original line number Diff line number Diff line environment: OPENSSL_INCLUDE_DIR: C:\OpenSSL\include OPENSSL_LIB_DIR: C:\OpenSSL\lib OPENSSL_LIBS: ssleay32:libeay32 matrix: - TARGET: i686-pc-windows-gnu BITS: 32 - TARGET: x86_64-pc-windows-msvc BITS: 64 install: - ps: Start-FileDownload "http://slproweb.com/download/Win${env:BITS}OpenSSL-1_0_2d.exe" - Win%BITS%OpenSSL-1_0_2d.exe /SILENT /VERYSILENT /SP- /DIR="C:\OpenSSL" - ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-nightly-${env:TARGET}.exe" - rust-nightly-%TARGET%.exe /VERYSILENT /NORESTART /DIR="C:\Program Files (x86)\Rust" - SET PATH=%PATH%;C:\Program Files (x86)\Rust\bin - SET PATH=%PATH%;C:\MinGW\bin - rustc -V - cargo -V build: false # Don't run doctests due to rust-lang/cargo#1592 test_script: - cargo test --lib --manifest-path openssl/Cargo.toml
openssl/Cargo.toml +1 −3 Original line number Diff line number Diff line Loading @@ -32,6 +32,4 @@ libc = "0.1" [dev-dependencies] rustc-serialize = "0.3" [dev-dependencies.connected_socket] connected_socket = "0.0.1" net2 = "0.2.13"
openssl/src/lib.rs +1 −2 Original line number Diff line number Diff line Loading @@ -11,8 +11,7 @@ extern crate openssl_sys as ffi; extern crate rustc_serialize as serialize; #[cfg(test)] #[cfg(any(feature="dtlsv1", feature="dtlsv1_2"))] extern crate connected_socket; extern crate net2; mod macros; Loading