From 03209e1e2d128a29a92d0669987d0e1de5e486c3 Mon Sep 17 00:00:00 2001 From: bjorn3 Date: Wed, 19 Aug 2020 14:07:43 +0200 Subject: [PATCH] Don't disable incremental cache for cargo.sh cc #1052 --- config.sh | 1 - test.sh | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/config.sh b/config.sh index 902743d54c7..b47da434c64 100644 --- a/config.sh +++ b/config.sh @@ -45,4 +45,3 @@ export LD_LIBRARY_PATH="$(pwd)/target/out:$(pwd)/build_sysroot/sysroot/lib/rustl export DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH export CG_CLIF_DISPLAY_CG_TIME=1 -export CG_CLIF_INCR_CACHE_DISABLED=1 diff --git a/test.sh b/test.sh index 95c6c6a582f..230e464d279 100755 --- a/test.sh +++ b/test.sh @@ -1,7 +1,7 @@ #!/bin/bash - set -e +# Build cg_clif if [[ "$1" == "--release" ]]; then export CHANNEL='release' CARGO_INCREMENTAL=1 cargo rustc --release -- -Zrun_dsymutil=no @@ -10,11 +10,15 @@ else cargo rustc -- -Zrun_dsymutil=no fi +# Config source config.sh +export CG_CLIF_INCR_CACHE_DISABLED=1 +# Cleanup rm -r target/out || true mkdir -p target/out/clif +# Perform all tests echo "[BUILD] mini_core" $RUSTC example/mini_core.rs --crate-name mini_core --crate-type lib,dylib --target $TARGET_TRIPLE