mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-25 20:25:28 +03:00
110 lines
4 KiB
Diff
110 lines
4 KiB
Diff
diff --git a/tests/compatibility-tests/Cargo.toml b/tests/compatibility-tests/Cargo.toml
|
|
index b3690c17..04bfbdca 100644
|
|
--- a/tests/compatibility-tests/Cargo.toml
|
|
+++ b/tests/compatibility-tests/Cargo.toml
|
|
@@ -30,12 +30,6 @@ license.workspace = true
|
|
codecov = { repository = "hickory-dns/hickory-dns", branch = "main", service = "github" }
|
|
maintenance = { status = "actively-developed" }
|
|
|
|
-[features]
|
|
-default = ["none"]
|
|
-none = []
|
|
-bind = []
|
|
-hickory_client = []
|
|
-
|
|
[lib]
|
|
name = "hickory_compatibility"
|
|
path = "src/lib.rs"
|
|
@@ -46,7 +40,7 @@ rand = { workspace = true, features = ["std", "thread_rng"] }
|
|
|
|
[dev-dependencies]
|
|
futures.workspace = true
|
|
-hickory-client = { workspace = true, features = ["dnssec-ring"] }
|
|
+hickory-client = { workspace = true, features = ["dnssec-aws-lc-rs"] }
|
|
rustls-pki-types.workspace = true
|
|
test-support.workspace = true
|
|
time.workspace = true
|
|
diff --git a/tests/compatibility-tests/src/bind.rs b/tests/compatibility-tests/src/bind.rs
|
|
index 3b1d413a..5362e3b1 100644
|
|
--- a/tests/compatibility-tests/src/bind.rs
|
|
+++ b/tests/compatibility-tests/src/bind.rs
|
|
@@ -5,7 +5,6 @@
|
|
// https://opensource.org/licenses/MIT>, at your option. This file may not be
|
|
// copied, modified, or distributed except according to those terms.
|
|
|
|
-use std::env;
|
|
use std::process::{Command, Stdio};
|
|
|
|
use super::*;
|
|
@@ -18,12 +17,7 @@ use super::*;
|
|
pub fn named_process() -> (NamedProcess, u16) {
|
|
let test_port = find_test_port();
|
|
|
|
- let bind_path = env::var("TDNS_BIND_PATH").expect("TDNS_BIND_PATH not set");
|
|
- let bind_path = format!("{bind_path}/sbin/named");
|
|
-
|
|
- println!(
|
|
- "Path to BIND '{bind_path}' this can be changed with the TDNS_BIND_PATH environment variable"
|
|
- );
|
|
+ let bind_path = "/usr/sbin/named";
|
|
|
|
let working_dir = new_working_dir();
|
|
println!("---> BIND working directory: {working_dir}");
|
|
diff --git a/tests/compatibility-tests/src/lib.rs b/tests/compatibility-tests/src/lib.rs
|
|
index d43bc75a..f13731e5 100644
|
|
--- a/tests/compatibility-tests/src/lib.rs
|
|
+++ b/tests/compatibility-tests/src/lib.rs
|
|
@@ -21,14 +21,8 @@ use std::thread;
|
|
use data_encoding::BASE32;
|
|
|
|
mod bind;
|
|
-mod none;
|
|
-
|
|
-#[cfg(feature = "bind")]
|
|
pub use bind::named_process;
|
|
|
|
-#[cfg(not(feature = "bind"))]
|
|
-pub use none::named_process;
|
|
-
|
|
fn find_test_port() -> u16 {
|
|
let server = std::net::UdpSocket::bind(("0.0.0.0", 0)).unwrap();
|
|
let server_addr = server.local_addr().unwrap();
|
|
diff --git a/tests/compatibility-tests/tests/integration/sig0_tests.rs b/tests/compatibility-tests/tests/integration/sig0_tests.rs
|
|
index 1551887e..888c4d47 100644
|
|
--- a/tests/compatibility-tests/tests/integration/sig0_tests.rs
|
|
+++ b/tests/compatibility-tests/tests/integration/sig0_tests.rs
|
|
@@ -5,8 +5,6 @@
|
|
// https://opensource.org/licenses/MIT>, at your option. This file may not be
|
|
// copied, modified, or distributed except according to those terms.
|
|
|
|
-#![cfg(not(feature = "none"))]
|
|
-
|
|
use std::net::{IpAddr, Ipv4Addr, SocketAddr};
|
|
use std::str::FromStr;
|
|
use std::sync::Arc;
|
|
diff --git a/tests/compatibility-tests/tests/integration/tsig_tests.rs b/tests/compatibility-tests/tests/integration/tsig_tests.rs
|
|
index 248c0b2c..f7b358c2 100644
|
|
--- a/tests/compatibility-tests/tests/integration/tsig_tests.rs
|
|
+++ b/tests/compatibility-tests/tests/integration/tsig_tests.rs
|
|
@@ -5,8 +5,6 @@
|
|
// https://opensource.org/licenses/MIT>, at your option. This file may not be
|
|
// copied, modified, or distributed except according to those terms.
|
|
|
|
-#![cfg(not(feature = "none"))]
|
|
-
|
|
use std::env;
|
|
use std::fs::File;
|
|
use std::io::Read;
|
|
diff --git a/tests/compatibility-tests/tests/integration/zone_transfer.rs b/tests/compatibility-tests/tests/integration/zone_transfer.rs
|
|
index cefbb3cb..02e6496e 100644
|
|
--- a/tests/compatibility-tests/tests/integration/zone_transfer.rs
|
|
+++ b/tests/compatibility-tests/tests/integration/zone_transfer.rs
|
|
@@ -5,8 +5,6 @@
|
|
// https://opensource.org/licenses/MIT>, at your option. This file may not be
|
|
// copied, modified, or distributed except according to those terms.
|
|
|
|
-#![cfg(not(feature = "none"))]
|
|
-
|
|
use std::net::{IpAddr, Ipv4Addr, SocketAddr};
|
|
use std::str::FromStr;
|
|
|