Merge pull request #288 from muzarski/compile-testing-conditionally

Compile `integration_testing.rs` conditionally

Author: muzarski

scylla-rust-wrapper/CMakeLists.txt

@@ -27,6 +27,10 @@ else()
   set(CMAKE_Rust_FLAGS "--cfg cpp_rust_unstable")
 endif()
 
+if(CASS_BUILD_INTEGRATION_TESTS)
+  set(CMAKE_Rust_FLAGS "${CMAKE_Rust_FLAGS} --cfg cpp_integration_testing")
+endif()
+
 if(APPLE)
   set(INSTALL_NAME_SHARED "libscylla-cpp-driver.${PROJECT_VERSION_STRING}.dylib")
   set(INSTALL_NAME_SHARED_SYMLINK_VERSION "libscylla-cpp-driver.${PROJECT_VERSION_MAJOR}.dylib")

scylla-rust-wrapper/Cargo.toml

@@ -60,3 +60,6 @@ strip = "none"
 
 [lints.rust]
 unsafe-op-in-unsafe-fn = "warn"
+unexpected_cfgs = { level = "warn", check-cfg = [
+    'cfg(cpp_integration_testing)',
+] }

scylla-rust-wrapper/src/cluster.rs

@@ -11,7 +11,6 @@ use crate::uuid::CassUuid;
 use openssl::ssl::SslContextBuilder;
 use openssl_sys::SSL_CTX_up_ref;
 use scylla::client::execution_profile::ExecutionProfileBuilder;
-use scylla::client::session::SessionConfig;
 use scylla::client::session_builder::SessionBuilder;
 use scylla::client::{SelfIdentity, WriteCoalescingDelay};
 use scylla::frame::Compression;
@@ -161,7 +160,16 @@ impl CassCluster {
     }
 
     #[inline]
-    pub(crate) fn get_session_config(&self) -> &SessionConfig {
+    pub(crate) fn get_client_id(&self) -> Option<uuid::Uuid> {
+        self.client_id
+    }
+}
+
+// Utilities for integration testing
+#[cfg(cpp_integration_testing)]
+impl CassCluster {
+    #[inline]
+    pub(crate) fn get_session_config(&self) -> &scylla::client::session::SessionConfig {
         &self.session_builder.config
     }
 
@@ -174,11 +182,6 @@ impl CassCluster {
     pub(crate) fn get_contact_points(&self) -> &[String] {
         &self.contact_points
     }
-
-    #[inline]
-    pub(crate) fn get_client_id(&self) -> Option<uuid::Uuid> {
-        self.client_id
-    }
 }
 
 impl FFI for CassCluster {

scylla-rust-wrapper/src/lib.rs

@@ -21,6 +21,7 @@ pub mod execution_error;
 mod external;
 pub mod future;
 pub mod inet;
+#[cfg(cpp_integration_testing)]
 pub mod integration_testing;
 pub mod iterator;
 mod logging;