diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-06-21 08:38:21 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-06-21 08:38:21 -0400 |
| commit | 72a5ae8c667fac09a639c46a145c9612424ef301 (patch) | |
| tree | 180cb720148736fde8f70260418b1292402cff7f /src/test | |
| parent | 683776bfab21ec48d967d8589412f81c6b39afe6 (diff) | |
| parent | 73bc863822bc58adaafc4017c25acaff0ecb43c1 (diff) | |
| download | tor-72a5ae8c667fac09a639c46a145c9612424ef301.tar.gz tor-72a5ae8c667fac09a639c46a145c9612424ef301.zip | |
Merge branch 'maint-0.3.4'
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/include.am | 6 | ||||
| -rw-r--r-- | src/test/rust_supp.txt | 1 | ||||
| -rwxr-xr-x | src/test/test_rust.sh | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/test/include.am b/src/test/include.am index d7f2d573a3..532092fea4 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -10,7 +10,10 @@ TESTS_ENVIRONMENT = \ export TESTING_TOR_BINARY="$(TESTING_TOR_BINARY)"; \ export CARGO="$(CARGO)"; \ export EXTRA_CARGO_OPTIONS="$(EXTRA_CARGO_OPTIONS)"; \ - export CARGO_ONLINE="$(CARGO_ONLINE)"; + export CARGO_ONLINE="$(CARGO_ONLINE)"; \ + export CCLD="$(CCLD)"; \ + chmod +x "$(abs_top_builddir)/link_rust.sh"; \ + export RUSTFLAGS="-C linker=$(abs_top_builddir)/link_rust.sh"; TESTSCRIPTS = \ src/test/fuzz_static_testcases.sh \ @@ -359,6 +362,7 @@ EXTRA_DIST += \ src/test/fuzz_static_testcases.sh \ src/test/slownacl_curve25519.py \ src/test/zero_length_keys.sh \ + src/test/rust_supp.txt \ src/test/test_keygen.sh \ src/test/test_key_expiration.sh \ src/test/test_zero_length_keys.sh \ diff --git a/src/test/rust_supp.txt b/src/test/rust_supp.txt new file mode 100644 index 0000000000..7fa50f3fb1 --- /dev/null +++ b/src/test/rust_supp.txt @@ -0,0 +1 @@ +leak:backtrace_alloc diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh index 4795258d06..b1eae7d5f2 100755 --- a/src/test/test_rust.sh +++ b/src/test/test_rust.sh @@ -3,6 +3,7 @@ set -e +export LSAN_OPTIONS=suppressions=${abs_top_srcdir}/src/test/rust_supp.txt for cargo_toml_dir in "${abs_top_srcdir:-../../..}"/src/rust/*; do if [ -e "${cargo_toml_dir}/Cargo.toml" ]; then @@ -16,5 +17,3 @@ for cargo_toml_dir in "${abs_top_srcdir:-../../..}"/src/rust/*; do done exit $exitcode - - |