Merge branch 'devel'

* devel:
  Only run builds for subset of matrix
  Build libraries at given build prefix
  Correct openssl hash
  Update openssl version, add test
  Add Python 2.6 virtualenv test

.travis.yml

+# Set TEST_BUILDS=1 to run library_builders tests
+
 language: generic
 
 matrix:
   include:
     - os: linux
+      dist: precise
+      env:
+        - TEST_BUILDS=1
+    - os: linux
+      dist: trusty
+      env:
+        - TEST_BUILDS=1
     - os: osx
       osx_image: xcode6.4
       env:
         - PYTHON_VERSION=2.6
+        - TEST_BUILDS=1
+    - os: osx
+      osx_image: xcode6.4
+      env:
+        - PYTHON_VERSION=2.6
+        - VENV=venv
     - os: osx
       env:
         - PYTHON_VERSION=2.7.11
+        - TEST_BUILDS=1
     - os: osx
       language: objective-c
       env:

library_builders.sh

@@ -27,9 +27,10 @@ BLOSC_VERSION=${BLOSC_VERSION:-1.10.2}
 SNAPPY_VERSION="${SNAPPY_VERSION:-1.1.3}"
 CURL_VERSION=${CURL_VERSION:-7.49.1}
 NETCDF_VERSION=${NETCDF_VERSION:-4.4.1.1}
-OPENSSL_ROOT=openssl-1.0.2j
-OPENSSL_HASH=e7aff292be21c259c6af26469c7a9b3ba26e9abaaffd325e3dccc9785256c431
-OPENSSL_DOWNLOAD_URL=ftp://ftp.openssl.org/source
+OPENSSL_ROOT=openssl-1.0.2k
+# Hash from https://www.openssl.org/source/openssl-1.0.2k.tar.gz.sha256
+OPENSSL_HASH=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0
+OPENSSL_DOWNLOAD_URL=https://www.openssl.org/source
 
 
 BUILD_PREFIX="${BUILD_PREFIX:-/usr/local}"

tests/test_library_builders.sh

+# Test some library builders
+# Smoke test
+export BUILD_PREFIX="${PWD}/builds"
+rm_mkdir $BUILD_PREFIX
+source library_builders.sh
+
+build_openssl

tests/test_multibuild.sh

@@ -14,6 +14,9 @@ else
     source manylinux_utils.sh
     source tests/test_manylinux_utils.sh
 fi
+if [ -n "$TEST_BUILDS" ]; then
+    source tests/test_library_builders.sh
+fi
 
 # Exit 1 if any test errors
 barf