aboutsummaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorSebastian Hahn <sebastian@torproject.org>2017-05-02 05:06:45 +0200
committerNick Mathewson <nickm@torproject.org>2017-05-19 08:47:11 -0400
commitd6f9a4f11acdfc8efea19a1644f355cdb90bfbb5 (patch)
tree0436dd60dc6d139535aae46b22a948402fd5faf4 /src/test
parented15511ac3ace940956c6c72a61387d37f035160 (diff)
downloadtor-d6f9a4f11acdfc8efea19a1644f355cdb90bfbb5.tar.gz
tor-d6f9a4f11acdfc8efea19a1644f355cdb90bfbb5.zip
cargo-online-mode configure argument
Passing --enable-cargo-online-mode during configure allows cargo to make network requests while building Tor or running tests. If this flag is not supplied, the dependencies need to be available in the form of a local mirror.
Diffstat (limited to 'src/test')
-rw-r--r--src/test/include.am3
-rwxr-xr-xsrc/test/test_rust.sh2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/test/include.am b/src/test/include.am
index 5fd61dd3e6..c0aca8afe2 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -7,7 +7,8 @@ TESTS_ENVIRONMENT = \
export abs_top_srcdir="$(abs_top_srcdir)"; \
export builddir="$(builddir)"; \
export TESTING_TOR_BINARY="$(TESTING_TOR_BINARY)"; \
- export CARGO="$(CARGO)";
+ export CARGO="$(CARGO)"; \
+ export CARGO_ONLINE="$(CARGO_ONLINE)";
TESTSCRIPTS = \
src/test/fuzz_static_testcases.sh \
diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh
index b41be978b9..7c71008e02 100755
--- a/src/test/test_rust.sh
+++ b/src/test/test_rust.sh
@@ -7,7 +7,7 @@ exitcode=0
for crate in $crates; do
cd "${abs_top_srcdir:-.}/src/rust/${crate}"
- "${CARGO:-cargo}" test --frozen || exitcode=1
+ "${CARGO:-cargo}" test ${CARGO_ONLINE-"--frozen"} || exitcode=1
done
exit $exitcode