diff options
| author | Sebastian Hahn <sebastian@torproject.org> | 2017-05-02 04:21:42 +0200 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-05-19 08:47:11 -0400 |
| commit | 70c067102b7d2576fa456d2872bb41abf559dff6 (patch) | |
| tree | 6feae5f63d84b607fe1e5c196473239ce4919471 /src/test | |
| parent | aeba64efad02e596dc3f15832d4bb96184c366a3 (diff) | |
| download | tor-70c067102b7d2576fa456d2872bb41abf559dff6.tar.gz tor-70c067102b7d2576fa456d2872bb41abf559dff6.zip | |
Allow Rust build using locally supplied crates or crates.io
This adds a couple of configure commands to control whether we're
requiring all dependencies to be available locally (default) or not
(--enable-cargo-online-mode). When building from a tarball, we require
the RUST_DEPENDENCIES variable to point to the local repository of
crates. This also adds src/ext/rust as a git submodule that contains
such a local repository for easy setup.
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/include.am | 1 | ||||
| -rwxr-xr-x | src/test/test_rust.sh | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/test/include.am b/src/test/include.am index c0aca8afe2..829c282dd9 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -5,6 +5,7 @@ TESTS_ENVIRONMENT = \ export PYTHON="$(PYTHON)"; \ export SHELL="$(SHELL)"; \ export abs_top_srcdir="$(abs_top_srcdir)"; \ + export abs_top_builddir="$(abs_top_builddir)"; \ export builddir="$(builddir)"; \ export TESTING_TOR_BINARY="$(TESTING_TOR_BINARY)"; \ export CARGO="$(CARGO)"; \ diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh index 7c71008e02..4427c70f13 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 ${CARGO_ONLINE-"--frozen"} || exitcode=1 + CARGO_TARGET_DIR="${abs_top_builddir}/src/rust/target" HOME="${abs_top_builddir}/src/rust" "${CARGO:-cargo}" test ${CARGO_ONLINE-"--frozen"} || exitcode=1 done exit $exitcode |