aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.travis.yml5
-rwxr-xr-x.travis/install.sh3
-rwxr-xr-x.travis/run.sh2
3 files changed, 10 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index e99d8908..4a50987a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,7 @@ cache:
directories:
- $HOME/.cache/pip
- $HOME/ossl-098l
+ - $HOME/ossl-100t
matrix:
include:
@@ -21,6 +22,10 @@ matrix:
env: TOXENV=py35
- python: pypy
env: TOXENV=pypy
+ - python: 2.7
+ env: TOXENV=py27 OPENSSL=1.0.0
+ - python: 3.5
+ env: TOXENV=py35 OPENSSL=1.0.0
- python: 2.6
env: TOXENV=py26 OPENSSL=0.9.8
- python: 2.7
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