nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rust: use a consistent working directory in builds and tests

Browse Source 
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.
This commit is contained in:
teor 2018-08-10 11:54:26 +10:00
parent 0f3fd10ee0
commit 229a75a49a
No known key found for this signature in database
GPG Key ID: 10FEAA0E7075672A
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug26497-cd Normal file
View File

@ -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.

2
src/test/test_rust.sh
View File

@ -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 for cargo_toml_dir in "${abs_top_srcdir:-../../..}"/src/rust/*; do
if [ -e "${cargo_toml_dir}/Cargo.toml" ]; then 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_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \
"${CARGO:-cargo}" test ${CARGO_ONLINE-"--frozen"} \ "${CARGO:-cargo}" test ${CARGO_ONLINE-"--frozen"} \
${EXTRA_CARGO_OPTIONS} \ ${EXTRA_CARGO_OPTIONS} \