mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 22:58:50 +01:00
Code Issues Projects Releases Wiki Activity

Revert "Remove duplicate MODULE_DIRAUTH_SOURCES from libtor_testing.a"

Browse source 
This reverts commit 70d91bd059.
This commit is contained in:
Nick Mathewson 2018-06-18 17:06:18 -04:00
parent 70d91bd059
commit 5879909826
5 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
changes/bug26402
View file

@ -1,4 +0,0 @@
o Minor bugfixes (compilation):
- When linking the libtor_testing.a library, only include the dirauth
object files once. Previously, they were getting added twice.
Fixes bug 26402; bugfix on 0.3.4.1-alpha.

1
configure.ac
View file

@ -2274,7 +2274,6 @@ AC_CONFIG_FILES([
src/config/torrc.sample src/config/torrc.sample
src/config/torrc.minimal src/config/torrc.minimal
src/rust/.cargo/config src/rust/.cargo/config
src/rust/build.rs
scripts/maint/checkOptionDocs.pl scripts/maint/checkOptionDocs.pl
scripts/maint/updateVersions.pl scripts/maint/updateVersions.pl
]) ])

2
src/or/include.am
View file

@ -131,7 +131,7 @@ endif
src_or_libtor_a_SOURCES = $(LIBTOR_A_SOURCES) src_or_libtor_a_SOURCES = $(LIBTOR_A_SOURCES)
if UNITTESTS_ENABLED if UNITTESTS_ENABLED
src_or_libtor_testing_a_SOURCES = $(LIBTOR_A_SOURCES) src_or_libtor_testing_a_SOURCES = $(LIBTOR_A_SOURCES) $(MODULE_DIRAUTH_SOURCES)
else else
src_or_libtor_testing_a_SOURCES = src_or_libtor_testing_a_SOURCES =
endif endif

2
src/rust/crypto/Cargo.toml
View file

@ -4,7 +4,6 @@ authors = ["The Tor Project",
name = "crypto" name = "crypto"
version = "0.0.1" version = "0.0.1"
publish = false publish = false
build = "../build.rs"
[lib] [lib]
name = "crypto" name = "crypto"
@ -27,3 +26,4 @@ rand_core = { version = "=0.2.0-pre.0", default-features = false }
[features] [features]
testing = ["tor_log/testing"] testing = ["tor_log/testing"]

2
src/test/include.am
View file

@ -375,5 +375,5 @@ EXTRA_DIST += \
src/test/test_workqueue_pipe2.sh \ src/test/test_workqueue_pipe2.sh \
src/test/test_workqueue_socketpair.sh src/test/test_workqueue_socketpair.sh
test-rust: src/rust/build.rs test-rust:
$(TESTS_ENVIRONMENT) "$(abs_top_srcdir)/src/test/test_rust.sh" $(TESTS_ENVIRONMENT) "$(abs_top_srcdir)/src/test/test_rust.sh"