commit 12f58b42a8adfeee09b140819819eee4108e22d8 parent 6e08807b543bad89be4de72ab73c0c2c5997aac7 Author: Nick Mathewson <nickm@torproject.org> Date: Fri, 27 Oct 2017 12:54:52 -0400 Allow test_rust.sh to run from outside the makefile (This is just a matter of making sure that we handle the case where abs_top_builddir is not set) Diffstat:
| M | src/test/test_rust.sh | | | 4 | +++- |
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh @@ -5,9 +5,11 @@ crates="protover tor_util smartlist tor_allocate" exitcode=0 +set -e + for crate in $crates; do cd "${abs_top_srcdir:-.}/src/rust/${crate}" - CARGO_TARGET_DIR="${abs_top_builddir}/src/rust/target" CARGO_HOME="${abs_top_builddir}/src/rust" "${CARGO:-cargo}" test ${CARGO_ONLINE-"--frozen"} || exitcode=1 + CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" CARGO_HOME="${abs_top_builddir:-../../..}/src/rust" "${CARGO:-cargo}" test ${CARGO_ONLINE-"--frozen"} || exitcode=1 cd - done