summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-07-09 09:14:37 -0400
committerNick Mathewson <nickm@torproject.org>2018-07-09 09:14:37 -0400
commit75d9db9e5b6d700029ff8ac362fa0ea5c80fbd80 (patch)
tree41cc5d9f847bacf851abb715f1f8a2d57c68d17a
parent1af69c1812e561e99f8cb859bec21edcc8dbcd74 (diff)
parentf721a08220fc0bef4e029e3fb87b9160782527c0 (diff)
downloadtor-75d9db9e5b6d700029ff8ac362fa0ea5c80fbd80.tar.gz
tor-75d9db9e5b6d700029ff8ac362fa0ea5c80fbd80.zip
Merge branch 'maint-0.3.3' into maint-0.3.4
-rwxr-xr-xsrc/test/test_rust.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh
index b1eae7d5f2..4ecca7834d 100755
--- a/src/test/test_rust.sh
+++ b/src/test/test_rust.sh
@@ -9,7 +9,7 @@ for cargo_toml_dir in "${abs_top_srcdir:-../../..}"/src/rust/*; do
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 ${CARGO_ONLINE-"--frozen"} \
${EXTRA_CARGO_OPTIONS} \
--manifest-path "${cargo_toml_dir}/Cargo.toml" || exitcode=1