aboutsummaryrefslogtreecommitdiffstats
path: root/.travis
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2016-01-03 18:28:02 -0500
committerAlex Gaynor <alex.gaynor@gmail.com>2016-01-03 18:28:02 -0500
commita7fcdb4d209ec24f1acfaa802963085bc43c2a58 (patch)
tree71e5f8c65400c19654e62e1ad913a089abdca5c2 /.travis
parent9d8390caabc8abe74825e8012aad210d60caa439 (diff)
parent29b407df11bceecfae9dfdbd7b7267e3fbf1040c (diff)
downloadcryptography-a7fcdb4d209ec24f1acfaa802963085bc43c2a58.tar.gz
cryptography-a7fcdb4d209ec24f1acfaa802963085bc43c2a58.tar.bz2
cryptography-a7fcdb4d209ec24f1acfaa802963085bc43c2a58.zip
Merge pull request #2625 from reaperhulk/full-coverage
full branch coverage by custom compiling 1.0.0
Diffstat (limited to '.travis')
-rwxr-xr-x.travis/install.sh3
-rwxr-xr-x.travis/run.sh2
2 files changed, 5 insertions, 0 deletions
diff --git a/.travis/install.sh b/.travis/install.sh
index 5e8c11cc..499233d7 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -67,6 +67,9 @@ else
# patches, but while that's in jenkins we don't get coverage data from it).
OPENSSL_VERSION_NUMBER="0.9.8l"
OPENSSL_DIR="ossl-098l"
+ elif [[ "${OPENSSL}" == "1.0.0" ]]; then
+ OPENSSL_VERSION_NUMBER="1.0.0t"
+ OPENSSL_DIR="ossl-100t"
fi
# download, compile, and install if it's not already present via travis cache
if [ -n "$OPENSSL_DIR" ]; then
diff --git a/.travis/run.sh b/.travis/run.sh
index 2b94e22f..9619c24a 100755
--- a/.travis/run.sh
+++ b/.travis/run.sh
@@ -28,6 +28,8 @@ else
fi
if [[ "${OPENSSL}" == "0.9.8" ]]; then
OPENSSL_DIR="ossl-098l"
+ elif [[ "${OPENSSL}" == "1.0.0" ]]; then
+ OPENSSL_DIR="ossl-100t"
fi
if [ -n "$OPENSSL_DIR" ]; then