Commit 38126781 authored by Steven Fackler's avatar Steven Fackler
Browse files

Little circle cleanup

parent 8fa9b587

circle.yml

+5 −7
Original line number Diff line number Diff line
@@ -20,15 +20,12 @@ job: &JOB 
  - save_cache:

      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:

test/build_openssl.sh

+2 −3
Original line number Diff line number Diff line
@@ -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