diff options
| author | Steven Fackler <[email protected]> | 2015-02-07 21:48:03 -0800 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2015-02-07 21:48:03 -0800 |
| commit | 0894efc3ff7616f78324202369d1f05ff60aeb15 (patch) | |
| tree | e354f2dd7eaf87333f9cdb5f5583f2608f04fa7e | |
| parent | Fix travis.yml (diff) | |
| download | rust-openssl-0894efc3ff7616f78324202369d1f05ff60aeb15.tar.xz rust-openssl-0894efc3ff7616f78324202369d1f05ff60aeb15.zip | |
Fix stuff
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | .travis/build_docs.sh | 2 | ||||
| -rw-r--r-- | openssl/test/cert.pem (renamed from test/cert.pem) | 0 | ||||
| -rw-r--r-- | openssl/test/key.pem (renamed from test/key.pem) | 0 |
4 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index bdbcbc78..dac913d1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ env: - secure: J4i75AV4KMrU/UQrLIzzIh35Xix40Ki0uWjm8j05oxlXVl5aPU2zB30AemDne2QXYzkN4kRG/iRnNORE/8D0lF7YipQNSNxgfiBVoOEfj/NSogvI2BftYX9vlLZJUvt+s/nbE3xa/Pyge1IPv7itDYGO7SMe8RTSqitgqyfE2Eg= - FEATURES="tlsv1_1 tlsv1_2 aes_xts" before_script: -- openssl s_server -accept 15418 -www -cert test/cert.pem -key test/key.pem >/dev/null 2>&1 & +- openssl s_server -accept 15418 -www -cert openssl/test/cert.pem -key openssl/test/key.pem >/dev/null 2>&1 & script: - (cd openssl && cargo test) - (cd openssl && cargo test --features $FEATURES) diff --git a/.travis/build_docs.sh b/.travis/build_docs.sh index 80c54ed0..67f1845c 100755 --- a/.travis/build_docs.sh +++ b/.travis/build_docs.sh @@ -7,5 +7,5 @@ mkdir doc for crate in $(echo openssl-sys openssl); do mkdir -p $crate/target ln -s -t $crate/target ../../doc - (cd $crate && cargo doc --no-deps --features $FEATURES) + (cd $crate && cargo doc --no-deps --features "$FEATURES") done diff --git a/test/cert.pem b/openssl/test/cert.pem index 1523c736..1523c736 100644 --- a/test/cert.pem +++ b/openssl/test/cert.pem diff --git a/test/key.pem b/openssl/test/key.pem index a3f80dd9..a3f80dd9 100644 --- a/test/key.pem +++ b/openssl/test/key.pem |