aboutsummaryrefslogtreecommitdiff
path: root/src/test/test_rust.sh
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2018-08-10 11:54:26 +1000
committerteor <teor@torproject.org>2018-08-10 11:54:26 +1000
commit229a75a49a440e61c97dca820cf59360470e1560 (patch)
tree0928e8389ef01b30d76239b70d78e5d51f57c96b /src/test/test_rust.sh
parent0f3fd10ee0f609cae6d2fe87fa437026f5e9e003 (diff)
downloadtor-229a75a49a440e61c97dca820cf59360470e1560.tar.gz
tor-229a75a49a440e61c97dca820cf59360470e1560.zip
Rust: use a consistent working directory in builds and tests
cd to ${abs_top_builddir}/src/rust before running cargo in src/test/test_rust.sh. Fixes bug 26497; bugfix on 0.3.3.2-alpha.
Diffstat (limited to 'src/test/test_rust.sh')
-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 2761b612b5..4afc84285f 100755
--- a/src/test/test_rust.sh
+++ b/src/test/test_rust.sh
@@ -7,7 +7,7 @@ export LSAN_OPTIONS=suppressions=${abs_top_srcdir:-../../..}/src/test/rust_supp.
for cargo_toml_dir in "${abs_top_srcdir:-../../..}"/src/rust/*; do
if [ -e "${cargo_toml_dir}/Cargo.toml" ]; then
- cd "${cargo_toml_dir}" && \
+ cd "${abs_top_builddir:-../../..}/src/rust" && \
CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \
"${CARGO:-cargo}" test ${CARGO_ONLINE-"--frozen"} \
${EXTRA_CARGO_OPTIONS} \