fixup! build: added ENABLE_MOCK_TOR_PROVIDER cmake build flag

fix spacing
blueprint-freespeech · Apr 2, 2024 · 657584d · 657584d
1 parent 183e973
commit 657584d
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 1 deletion.
diff --git a/source/gosling/crates/cgosling/Cargo.toml.in b/source/gosling/crates/cgosling/Cargo.toml.in
@@ -24,6 +24,9 @@ static_assertions = "1.1"
 tor-interface = { path = "../tor-interface" }
 which = "4.4"
 
+[dev-dependencies]
+serial_test = "0.9"
+
 [lib]
 name = "cgosling"
 crate-type = ["staticlib" ,"rlib"]

diff --git a/source/gosling/crates/cgosling/fuzz/Cargo.toml b/source/gosling/crates/cgosling/fuzz/Cargo.toml
@@ -12,6 +12,7 @@ libfuzzer-sys = { version = "0.4", features = ["arbitrary-derive"] }
 
 [dependencies.cgosling]
 path = ".."
+features = ["mock-tor-provider"]
 
 # Prevent this from interfering with workspaces
 [workspace]

diff --git a/source/gosling/crates/cgosling/tests/ffi.rs b/source/gosling/crates/cgosling/tests/ffi.rs
@@ -12,6 +12,8 @@ use std::sync::atomic::{AtomicBool, Ordering};
 
 // external crates
 use anyhow::bail;
+#[cfg(test)]
+use serial_test::serial;
 
 // internal crates
 use cgosling::ffi::*;
@@ -234,6 +236,7 @@ fn create_server_endpoint_handshake(context: *mut GoslingContext) -> anyhow::Res
 }
 
 #[test]
+#[serial]
 #[cfg(feature = "mock-tor-provider")]
 fn test_gosling_ffi_handshake_mock_client() -> anyhow::Result<()> {
     let library = test_gosling_ffi_handshake_preamble()?;
@@ -250,6 +253,7 @@ fn test_gosling_ffi_handshake_mock_client() -> anyhow::Result<()> {
 }
 
 #[test]
+#[serial]
 #[cfg(feature = "legacy-tor-provider")]
 fn test_gosling_ffi_handshake_legacy_client() -> anyhow::Result<()> {
     let library = test_gosling_ffi_handshake_preamble()?;

diff --git a/source/gosling/crates/gosling/fuzz/Cargo.toml b/source/gosling/crates/gosling/fuzz/Cargo.toml
@@ -13,7 +13,7 @@ curve25519-dalek = "4.1"
 data-encoding = "2.0"
 honk-rpc = { path = "../../honk-rpc" }
 libfuzzer-sys = { version = "0.4", features = ["arbitrary-derive"] }
-tor-interface = { path = "../../tor-interface" }
+tor-interface = { path = "../../tor-interface", features = ["mock-tor-provider"] }
 
 [dependencies.gosling]
 path = ".."

diff --git a/source/gosling/crates/tor-interface/Cargo.toml b/source/gosling/crates/tor-interface/Cargo.toml
@@ -28,6 +28,7 @@ tor-llcrypto = { version = "0.7", features = ["relay"] }
 anyhow = "1.0"
 serial_test = "0.9"
 which = "4.4"
+
 [features]
 mock-tor-provider = []
 legacy-tor-provider = []