Don't try to link C from rust doctests for nss detection

This is really annoying, since we can't use cfg(test) for doctests.

diff --git a/src/rust/Cargo.toml b/src/rust/Cargo.toml
index 4bbadbe5352b84d46e63d515e3285b88223e95f6..e399dbb33a22534f712afccd9963198c0f31c8f8 100644 (file)
--- a/src/rust/Cargo.toml
+++ b/src/rust/Cargo.toml
@@ -23,3 +23,9 @@ default = []
 test-c-from-rust = [
     "crypto/test-c-from-rust",
 ]
+
+# We have to define a feature here because doctests don't get cfg(test),
+# and we need to disable some C dependencies when running the doctests
+# because of the various linker issues.  See
+# https://github.com/rust-lang/rust/issues/45599
+test_linking_hack = []

diff --git a/src/rust/crypto/Cargo.toml b/src/rust/crypto/Cargo.toml
index d68ac48e28a69dc73848fb81db1cc4a1a059eb86..6ebfe0dc11a02f179743b48ebd2b3ba1b961e9b2 100644 (file)
--- a/src/rust/crypto/Cargo.toml
+++ b/src/rust/crypto/Cargo.toml
@@ -30,3 +30,9 @@ rand_core = { version = "=0.2.0-pre.0", default-features = false }
 # execute with `cargo test`.  Due to numerous linker issues (#25386), this is
 # currently disabled by default.
 test-c-from-rust = []
+
+# We have to define a feature here because doctests don't get cfg(test),
+# and we need to disable some C dependencies when running the doctests
+# because of the various linker issues.  See
+# https://github.com/rust-lang/rust/issues/45599
+test_linking_hack = []

diff --git a/src/rust/external/Cargo.toml b/src/rust/external/Cargo.toml
index 60ec03be4099aca8d6b17211341a116e9d5bf819..4735144ee6b7e14529eb6dbcefc0d449e77b2620 100644 (file)
--- a/src/rust/external/Cargo.toml
+++ b/src/rust/external/Cargo.toml
@@ -14,3 +14,9 @@ name = "external"
 path = "lib.rs"
 crate_type = ["rlib", "staticlib"]
 
+[features]
+# We have to define a feature here because doctests don't get cfg(test),
+# and we need to disable some C dependencies when running the doctests
+# because of the various linker issues.  See
+# https://github.com/rust-lang/rust/issues/45599
+test_linking_hack = []

diff --git a/src/rust/protover/Cargo.toml b/src/rust/protover/Cargo.toml
index a8480e142ae56a8e20f79a66f462e36775bf5878..2f7783e76c9e72448e50907fc0dc33f2db74e851 100644 (file)
--- a/src/rust/protover/Cargo.toml
+++ b/src/rust/protover/Cargo.toml
@@ -4,6 +4,11 @@ version = "0.0.1"
 name = "protover"
 
 [features]
+# We have to define a feature here because doctests don't get cfg(test),
+# and we need to disable some C dependencies when running the doctests
+# because of the various linker issues.  See
+# https://github.com/rust-lang/rust/issues/45599
+test_linking_hack = []
 
 [dependencies]
 libc = "=0.2.39"
@@ -27,4 +32,3 @@ path = "../tor_log"
 name = "protover"
 path = "lib.rs"
 crate_type = ["rlib", "staticlib"]
-

diff --git a/src/rust/protover/protover.rs b/src/rust/protover/protover.rs
index 7b3f808cb2d72793f8414b30b0838ce948d09b3e..8417d8595937d1280378fae033af06571be74cb7 100644 (file)
--- a/src/rust/protover/protover.rs
+++ b/src/rust/protover/protover.rs
@@ -10,7 +10,6 @@ use std::str::FromStr;
 use std::string::String;
 
 use external::c_tor_version_as_new_as;
-use external::c_tor_is_using_nss;
 
 use errors::ProtoverError;
 use protoset::ProtoSet;
@@ -125,6 +124,17 @@ impl From<Protocol> for UnknownProtocol {
     }
 }
 
+#[cfg(feature="test_linking_hack")]
+fn have_linkauth_v1() -> bool {
+    true
+}
+
+#[cfg(not(feature="test_linking_hack"))]
+fn have_linkauth_v1() -> bool {
+    use external::c_tor_is_using_nss;
+    ! c_tor_is_using_nss()
+}
+
 /// Get a CStr representation of current supported protocols, for
 /// passing to C, or for converting to a `&str` for Rust.
 ///
@@ -142,7 +152,7 @@ impl From<Protocol> for UnknownProtocol {
 ///
 //  C_RUST_COUPLED: protover.c `protover_get_supported_protocols`
 pub(crate) fn get_supported_protocols_cstr() -> &'static CStr {
-    if c_tor_is_using_nss() {
+    if ! have_linkauth_v1() {
         cstr!("Cons=1-2 \
                Desc=1-2 \
                DirCache=1-2 \

diff --git a/src/rust/smartlist/Cargo.toml b/src/rust/smartlist/Cargo.toml
index 6ddcbee8e9b9c49719b3ec6a6700050301223ed4..4ecdf508690bfba83aac29ed94f03e7767a15370 100644 (file)
--- a/src/rust/smartlist/Cargo.toml
+++ b/src/rust/smartlist/Cargo.toml
@@ -11,3 +11,9 @@ name = "smartlist"
 path = "lib.rs"
 crate_type = ["rlib", "staticlib"]
 
+[features]
+# We have to define a feature here because doctests don't get cfg(test),
+# and we need to disable some C dependencies when running the doctests
+# because of the various linker issues.  See
+# https://github.com/rust-lang/rust/issues/45599
+test_linking_hack = []

diff --git a/src/rust/tor_allocate/Cargo.toml b/src/rust/tor_allocate/Cargo.toml
index 468425f115a3f9240a9af103e033c4e4ce66c860..7bb3b9887f688eca9d5f4e213fd13d06e0574eeb 100644 (file)
--- a/src/rust/tor_allocate/Cargo.toml
+++ b/src/rust/tor_allocate/Cargo.toml
@@ -11,3 +11,9 @@ name = "tor_allocate"
 path = "lib.rs"
 crate_type = ["rlib", "staticlib"]
 
+[features]
+# We have to define a feature here because doctests don't get cfg(test),
+# and we need to disable some C dependencies when running the doctests
+# because of the various linker issues.  See
+# https://github.com/rust-lang/rust/issues/45599
+test_linking_hack = []

diff --git a/src/rust/tor_log/Cargo.toml b/src/rust/tor_log/Cargo.toml
index 9d06299c051799275b10d16dd9c5c6d1124970e5..1aa9be0612d70ef5464dda12a3d968637b631dde 100644 (file)
--- a/src/rust/tor_log/Cargo.toml
+++ b/src/rust/tor_log/Cargo.toml
@@ -9,6 +9,11 @@ path = "lib.rs"
 crate_type = ["rlib", "staticlib"]
 
 [features]
+# We have to define a feature here because doctests don't get cfg(test),
+# and we need to disable some C dependencies when running the doctests
+# because of the various linker issues.  See
+# https://github.com/rust-lang/rust/issues/45599
+test_linking_hack = []
 
 [dependencies]
 libc = "0.2.39"

diff --git a/src/rust/tor_rust/Cargo.toml b/src/rust/tor_rust/Cargo.toml
index 86fad3ee76ce816394e7a3c8c6f1f77877012a33..1523ee0dd1185f75c9716af3c138238a16a4bc85 100644 (file)
--- a/src/rust/tor_rust/Cargo.toml
+++ b/src/rust/tor_rust/Cargo.toml
@@ -14,3 +14,9 @@ path = "../tor_util"
 [dependencies.protover]
 path = "../protover"
 
+[features]
+# We have to define a feature here because doctests don't get cfg(test),
+# and we need to disable some C dependencies when running the doctests
+# because of the various linker issues.  See
+# https://github.com/rust-lang/rust/issues/45599
+test_linking_hack = []

diff --git a/src/rust/tor_util/Cargo.toml b/src/rust/tor_util/Cargo.toml
index a606a280b259ed9284994b29b0d426ddfc3b4d6a..51e4bd9c5d1d40de1f411561687a089d89103cb2 100644 (file)
--- a/src/rust/tor_util/Cargo.toml
+++ b/src/rust/tor_util/Cargo.toml
@@ -17,3 +17,9 @@ path = "../tor_log"
 [dependencies]
 libc = "=0.2.39"
 
+[features]
+# We have to define a feature here because doctests don't get cfg(test),
+# and we need to disable some C dependencies when running the doctests
+# because of the various linker issues.  See
+# https://github.com/rust-lang/rust/issues/45599
+test_linking_hack = []

diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh
index 4afc84285f003dccf6ada2bebcf8be6a25468ac7..a1a56af4809c727db283d1cd5b0252d9d54e3bc4 100755 (executable)
--- a/src/test/test_rust.sh
+++ b/src/test/test_rust.sh
@@ -10,6 +10,7 @@ for cargo_toml_dir in "${abs_top_srcdir:-../../..}"/src/rust/*; do
        cd "${abs_top_builddir:-../../..}/src/rust" && \
            CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \
            "${CARGO:-cargo}" test ${CARGO_ONLINE-"--frozen"} \
+           --features "test_linking_hack" \
            ${EXTRA_CARGO_OPTIONS} \
            --manifest-path "${cargo_toml_dir}/Cargo.toml" || exitcode=1
     fi