reconfigure running of rust and python tests

This commit is contained in:
holger krekel
2019-11-21 01:21:23 +01:00
parent e13ce3140b
commit 8e7dc5e86f
6 changed files with 107 additions and 23 deletions

View File

@@ -10,7 +10,8 @@ export OPT_RELEASE="--release ${OPT}"
export OPT_FFI_RELEASE="--manifest-path=deltachat-ffi/Cargo.toml --release"
# Select cargo command: use cross by default
export CARGO_CMD=cross
# export CARGO_CMD=cross
export CARGO_CMD=cargo
# On Appveyor (windows) and Travis (x86_64-unknown-linux-gnu and apple) native targets we use cargo (no need to cross-compile):
if [[ $TARGET = *"windows"* ]] || [[ $TARGET == "x86_64-unknown-linux-gnu" ]] || [[ $TARGET = *"apple"* ]]; then
@@ -18,9 +19,9 @@ if [[ $TARGET = *"windows"* ]] || [[ $TARGET == "x86_64-unknown-linux-gnu" ]] ||
fi
# Install cross if necessary:
if [[ $CARGO_CMD == "cross" ]]; then
cargo install --git https://github.com/dignifiedquire/cross --rev fix-tty --force
fi
#if [[ $CARGO_CMD == "cross" ]]; then
# cargo install --git https://github.com/dignifiedquire/cross --rev fix-tty --force
##fi
# Make sure TARGET is installed when using cargo:
if [[ $CARGO_CMD == "cargo" ]]; then
@@ -32,8 +33,8 @@ if [[ $NORUN == "1" ]]; then
export CARGO_SUBCMD="build"
else
export CARGO_SUBCMD="test --all"
export OPT="-j1 ${OPT} "
export OPT_RELEASE="-j2 ${OPT_RELEASE} "
export OPT="${OPT} "
export OPT_RELEASE="${OPT_RELEASE} "
export OPT_RELEASE_IGNORED="${OPT_RELEASE} -- --ignored"
fi