Avoid openssl rebuild if possible

edenhill · edenhill · commit 74fbd38ef911 · 2017-09-05T12:43:49.000+02:00
diff --git a/tools/build-openssl.sh b/tools/build-openssl.sh
@@ -17,16 +17,26 @@ set -ex
 
 echo "# Building OpenSSL ${OPENSSL_VERSION}"
 
-rm -rf build-openssl
-mkdir -p build-openssl
-pushd build-openssl
-curl -s -l https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz | \
-    tar -xz --strip-components=1 -f -
+
+if [[ ! -f build-openssl/config ]]; then
+    rm -rf build-openssl
+    mkdir -p build-openssl
+    pushd build-openssl
+    curl -s -l https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz | \
+        tar -xz --strip-components=1 -f -
+else
+    echo "Reusing existing build-openssl directory"
+    pushd build-openssl
+fi
+
 ./config --prefix=${PREFIX} zlib no-krb5 zlib shared
 echo "## building openssl"
 time make -j 2>&1 | tail -20
-echo "## testing openssl"
-time make -j test 2>&1 | tail -20
+if [[ ! -f test/PASSED ]]; then
+    echo "## testing openssl"
+    time make test 2>&1 | tail -20
+    touch test/PASSED
+fi
 echo "## installing openssl"
 time make install 2>&1 | tail -20
 popd
diff --git a/tools/test-manylinux.sh b/tools/test-manylinux.sh
@@ -69,6 +69,9 @@ function run_all_with_docker {
     if [[ -z $_wheels ]]; then
         echo "No wheels in wheelhouse/, must run build-manylinux.sh first"
         exit 1
+    else
+        echo "Wheels:"
+        ls wheelhouse/*.whl
     fi
 
     for DOCKER_IMAGE in $DOCKER_IMAGES; do
