diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-06-20 17:07:47 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-06-20 17:07:47 -0400 |
| commit | e99ecf939936ed1e8fabbf2f30488d20389ecb7b (patch) | |
| tree | 8feae21aa532972c2efc6e813817ecd0ef08f325 /src/test | |
| parent | 7589fd6d403ac2aecb991a07069d78c6dccae719 (diff) | |
| parent | bd9ebb3763b90a8ef429376ee578e0571371145f (diff) | |
| download | tor-e99ecf939936ed1e8fabbf2f30488d20389ecb7b.tar.gz tor-e99ecf939936ed1e8fabbf2f30488d20389ecb7b.zip | |
Merge branch 'rust_build_script_v3' into additional_rust_test_fixes
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/include.am | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/test/include.am b/src/test/include.am index 2ae598b224..4146de73b1 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 \ @@ -347,7 +350,7 @@ src_test_test_bt_cl_LDADD = src/common/libor-testing.a \ src/trace/libor-trace.a \ $(rust_ldadd) \ @TOR_LIB_MATH@ \ - @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ + @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ src_test_test_bt_cl_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) src_test_test_bt_cl_CPPFLAGS= $(src_test_AM_CPPFLAGS) $(TEST_CPPFLAGS) |