From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 9 Jul 2018 13:14:37 +0000 (-0400)
Subject: Merge branch 'maint-0.3.3' into maint-0.3.4
X-Git-Tag: tor-0.3.4.4-rc~8^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=75d9db9e5b6d700029ff8ac362fa0ea5c80fbd80;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.3' into maint-0.3.4
---

75d9db9e5b6d700029ff8ac362fa0ea5c80fbd80
diff --cc src/test/test_rust.sh
index b1eae7d5f2,c7d0439ad1..4ecca7834d
--- a/src/test/test_rust.sh
+++ b/src/test/test_rust.sh
@@@ -9,8 -8,8 +9,8 @@@ for cargo_toml_dir in "${abs_top_srcdir
      if [ -e "${cargo_toml_dir}/Cargo.toml" ]; then
  	cd "${cargo_toml_dir}" && \
  	    CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \
- 	    CARGO_HOME="${abs_top_builddir:-../../..}/src/rust" \
+ 	    CARGO_HOME="${abs_top_builddir:-../../..}/src/rust/.cargo" \
 -	    "${CARGO:-cargo}" test --all-features ${CARGO_ONLINE-"--frozen"} \
 +	    "${CARGO:-cargo}" test ${CARGO_ONLINE-"--frozen"} \
  	    ${EXTRA_CARGO_OPTIONS} \
  	    --manifest-path "${cargo_toml_dir}/Cargo.toml" || exitcode=1
      fi