diff options
| author | Taylor Yu <catalyst@torproject.org> | 2018-06-21 18:20:03 -0500 |
|---|---|---|
| committer | Taylor Yu <catalyst@torproject.org> | 2018-06-21 18:20:03 -0500 |
| commit | d935aceb2b2493999f0982834406a0604a12ab9d (patch) | |
| tree | 20d9c2b4c55fc2c0d48472612504e8fb2fa2d05c | |
| parent | 8b108935b25fb7421443a070415a677f9dcde325 (diff) | |
| download | tor-d935aceb2b2493999f0982834406a0604a12ab9d.tar.gz tor-d935aceb2b2493999f0982834406a0604a12ab9d.zip | |
Use correct CARGO_HOME in test_rust.sh
Out-of-tree builds could fail to run the rust tests if built in
offline mode. cargo expects CARGO_HOME to point to the .cargo
directory, not the directory containing .cargo.
Fixes bug 26455; bug not in any released tor.
| -rwxr-xr-x | src/test/test_rust.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh index 95ffc2e659..c7d0439ad1 100755 --- a/src/test/test_rust.sh +++ b/src/test/test_rust.sh @@ -8,7 +8,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 --all-features ${CARGO_ONLINE-"--frozen"} \ ${EXTRA_CARGO_OPTIONS} \ --manifest-path "${cargo_toml_dir}/Cargo.toml" || exitcode=1 |