[tor-commits] [tor/maint-0.3.4] Rust: use a consistent working directory in builds and tests

[nickm at torproject.org]

commit 229a75a49a440e61c97dca820cf59360470e1560
Author: teor <teor at torproject.org>
Date:   Fri Aug 10 11:54:26 2018 +1000

    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.
---
 changes/bug26497-cd   | 4 ++++
 src/test/test_rust.sh | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes/bug26497-cd b/changes/bug26497-cd
new file mode 100644
index 000000000..37bf1bc95
--- /dev/null
+++ b/changes/bug26497-cd
@@ -0,0 +1,4 @@
+  o Minor bugfixes (rust):
+    - cd to ${abs_top_builddir}/src/rust before running cargo in
+      src/test/test_rust.sh. This makes the working directory consistent
+      between builds and tests. Fixes bug 26497; bugfix on 0.3.3.2-alpha.
diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh
index 2761b612b..4afc84285 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} \