min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Run systest for ARM targets 

Also bump to the 1.19 image to make targets a bit easier to manage.
This commit is contained in:
Steven Fackler 2017-07-24 22:37:31 -07:00
parent 581fadc34c
commit 8450cfbb52
2 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
circle.yml
View File

@ -1,12 +1,12 @@
job: &JOB job: &JOB
working_directory: ~/build working_directory: ~/build
docker: docker:
- image: jimmycuadra/rust:1.18.0 - image: jimmycuadra/rust:1.19.0
steps: steps:
- checkout - checkout
- run: apt-get update - run: apt-get update
- run: apt-get install -y curl - run: apt-get install -y curl
- run: RUST_VERSION=1.18.0 ./test/add_target.sh - run: RUST_VERSION=1.19.0 ./test/add_target.sh
- restore_cache: - restore_cache:
key: registry key: registry
- run: cargo generate-lockfile - run: cargo generate-lockfile
@ -26,11 +26,7 @@ job: &JOB
key: deps-1.18.0-{{ checksum "Cargo.lock" }}-{{ checksum "~/lib_key" }} key: deps-1.18.0-{{ checksum "Cargo.lock" }}-{{ checksum "~/lib_key" }}
- run: | - run: |
export OPENSSL_DIR=$HOME/openssl export OPENSSL_DIR=$HOME/openssl
case "${NO_RUN}" in cargo run --manifest-path=systest/Cargo.toml --target $TARGET
"1") CMD=build;;
"") CMD=run;;
esac
cargo $CMD --manifest-path=systest/Cargo.toml --target $TARGET
- run: | - run: |
export OPENSSL_DIR=$HOME/openssl export OPENSSL_DIR=$HOME/openssl
export PATH=$OPENSSL_DIR/bin:$PATH export PATH=$OPENSSL_DIR/bin:$PATH
@ -73,6 +69,7 @@ armhf: &ARMHF
NO_RUN: 1 NO_RUN: 1
CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_LINKER: arm-linux-gnueabihf-gcc CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_LINKER: arm-linux-gnueabihf-gcc
CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_AR: arm-linux-gnueabihf-ar CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_AR: arm-linux-gnueabihf-ar
CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_RUNNER: qemu-arm-static
base: &BASE base: &BASE
RUST_BACKTRACE: 1 RUST_BACKTRACE: 1

17
test/add_target.sh
View File

@ -9,24 +9,13 @@ case "${TARGET}" in
apt-get install -y --no-install-recommends gcc-multilib apt-get install -y --no-install-recommends gcc-multilib
;; ;;
"arm-unknown-linux-gnueabihf") "arm-unknown-linux-gnueabihf")
echo "deb http://emdebian.org/tools/debian/ jessie main" \
> /etc/apt/sources.list.d/crosstools.list
curl http://emdebian.org/tools/debian/emdebian-toolchain-archive.key | apt-key add -
dpkg --add-architecture armhf dpkg --add-architecture armhf
apt-get update apt-get update
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
gcc-arm-linux-gnueabihf \ gcc-arm-linux-gnueabihf \
libc6-dev:armhf libc6-dev:armhf \
qemu-user-static
;; ;;
esac esac
OUT=/tmp/std.tar.gz rustup target add ${TARGET}
curl -o ${OUT} https://static.rust-lang.org/dist/rust-std-${RUST_VERSION}-${TARGET}.tar.gz
WORKDIR=/tmp/std
mkdir -p ${WORKDIR}
cd ${WORKDIR}
tar --strip-components=1 -xzf ${OUT}
./install.sh