diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-08-21 20:04:13 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-08-21 20:04:13 -0400 |
| commit | bf5704051c018dbd0ba0a4dd09904efe521fab62 (patch) | |
| tree | 838397f517f4a17719a66c58114160c61072562f /src | |
| parent | de66bd397c61d88228fa4c1d4b7e5b7f9c08a115 (diff) | |
| parent | 00e4a707745d1faf4501e71be822042d5b5477f0 (diff) | |
| download | tor-bf5704051c018dbd0ba0a4dd09904efe521fab62.tar.gz tor-bf5704051c018dbd0ba0a4dd09904efe521fab62.zip | |
Merge remote-tracking branch 'teor/travis-osx-master'
Diffstat (limited to 'src')
| -rw-r--r-- | src/rust/tor_rust/include.am | 2 | ||||
| -rwxr-xr-x | src/test/test_rust.sh | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/rust/tor_rust/include.am b/src/rust/tor_rust/include.am index ecc821a887..ce673abbee 100644 --- a/src/rust/tor_rust/include.am +++ b/src/rust/tor_rust/include.am @@ -7,7 +7,6 @@ EXTRA_CARGO_OPTIONS= @TOR_RUST_LIB_PATH@: FORCE ( cd "$(abs_top_builddir)/src/rust" ; \ CARGO_TARGET_DIR="$(abs_top_builddir)/src/rust/target" \ - CARGO_HOME="$(abs_top_builddir)/src/rust" \ $(CARGO) build --release $(EXTRA_CARGO_OPTIONS) \ $(CARGO_ONLINE) \ --manifest-path "$(abs_top_srcdir)/src/rust/tor_rust/Cargo.toml" ) @@ -15,7 +14,6 @@ EXTRA_CARGO_OPTIONS= distclean-rust: ( cd "$(abs_top_builddir)/src/rust" ; \ CARGO_TARGET_DIR="$(abs_top_builddir)/src/rust/target" \ - CARGO_HOME="$(abs_top_builddir)/src/rust" \ $(CARGO) clean $(EXTRA_CARGO_OPTIONS) \ $(CARGO_ONLINE) \ --manifest-path "$(abs_top_srcdir)/src/rust/tor_rust/Cargo.toml" ) diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh index 4ecca7834d..4afc84285f 100755 --- a/src/test/test_rust.sh +++ b/src/test/test_rust.sh @@ -3,13 +3,12 @@ set -e -export LSAN_OPTIONS=suppressions=${abs_top_srcdir}/src/test/rust_supp.txt +export LSAN_OPTIONS=suppressions=${abs_top_srcdir:-../../..}/src/test/rust_supp.txt 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_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 |