aboutsummaryrefslogtreecommitdiff
path: root/src/test/test_rust.sh
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-10-27 12:54:52 -0400
committerNick Mathewson <nickm@torproject.org>2017-10-27 12:54:52 -0400
commit12f58b42a8adfeee09b140819819eee4108e22d8 (patch)
tree368ff5d329ac3a4d65eff3abcbd6ecf54d2bd368 /src/test/test_rust.sh
parent6e08807b543bad89be4de72ab73c0c2c5997aac7 (diff)
downloadtor-12f58b42a8adfeee09b140819819eee4108e22d8.tar.gz
tor-12f58b42a8adfeee09b140819819eee4108e22d8.zip
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 (limited to 'src/test/test_rust.sh')
-rwxr-xr-xsrc/test/test_rust.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh
index 50740fd18e..8d7900e1df 100755
--- 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