diff options
| author | Steven Fackler <[email protected]> | 2017-07-27 19:59:24 -0700 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2017-07-27 22:20:01 -0700 |
| commit | 381267816f269de1649b38389ea054da66f6a34a (patch) | |
| tree | ba494404d2f76c6518db84257d57653c2453bac8 | |
| parent | Tweak formatting on cipher list (diff) | |
| download | rust-openssl-381267816f269de1649b38389ea054da66f6a34a.tar.xz rust-openssl-381267816f269de1649b38389ea054da66f6a34a.zip | |
Little circle cleanup
| -rw-r--r-- | circle.yml | 12 | ||||
| -rwxr-xr-x | test/build_openssl.sh | 5 |
2 files changed, 7 insertions, 10 deletions
@@ -15,20 +15,17 @@ job: &JOB - ~/.cargo/registry/index - run: echo "${LIBRARY}-${VERSION}-${TARGET}" > ~/lib_key - restore_cache: - key: lib-{{ checksum "~/lib_key" }}-{{ checksum "test/build_openssl.sh"}} + key: lib-{{ checksum "~/lib_key" }}-{{ checksum "test/build_openssl.sh" }} - run: ./test/build_openssl.sh - save_cache: - key: lib-{{ checksum "~/lib_key" }}-{{ checksum "test/build_openssl.sh"}} + key: lib-{{ checksum "~/lib_key" }}-{{ checksum "test/build_openssl.sh" }} paths: - - ~/openssl + - /openssl - restore_cache: key: deps-1.19.0-{{ checksum "Cargo.lock" }}-{{ checksum "~/lib_key" }} - - run: | - export OPENSSL_DIR=$HOME/openssl - cargo run --manifest-path=systest/Cargo.toml --target $TARGET + - run: cargo run --manifest-path=systest/Cargo.toml --target $TARGET - run: | ulimit -c unlimited - export OPENSSL_DIR=$HOME/openssl export PATH=$OPENSSL_DIR/bin:$PATH if [ "${NO_RUN}" = "1" ]; then TEST_ARGS=--no-run @@ -81,6 +78,7 @@ armhf: &ARMHF base: &BASE RUST_BACKTRACE: 1 + OPENSSL_DIR: /openssl version: 2 jobs: diff --git a/test/build_openssl.sh b/test/build_openssl.sh index 3decd937..67a0d804 100755 --- a/test/build_openssl.sh +++ b/test/build_openssl.sh @@ -43,13 +43,12 @@ curl -o ${OUT} -L --max-redirs ${MAX_REDIRECTS} ${URL1} \ tar --strip-components=1 -xzf ${OUT} -PREFIX=${HOME}/openssl case "${LIBRARY}" in "openssl") - ./Configure --prefix=${PREFIX} ${OS_COMPILER} -fPIC -g ${OS_FLAGS} no-shared + ./Configure --prefix=${OPENSSL_DIR} ${OS_COMPILER} -fPIC -g ${OS_FLAGS} no-shared ;; "libressl") - ./configure --prefix=${PREFIX} --disable-shared --with-pic + ./configure --prefix=${OPENSSL_DIR} --disable-shared --with-pic ;; esac |