diff --git a/Cargo.lock b/Cargo.lock index 0610adc504..33fcad859a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3758,8 +3758,6 @@ dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "num-derive 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "serial_test 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serial_test_derive 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "solana-logger 1.2.0", "solana-sdk 1.2.0", "solana_rbpf 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/programs/bpf_loader/Cargo.toml b/programs/bpf_loader/Cargo.toml index 2d457402b5..7d12d07213 100644 --- a/programs/bpf_loader/Cargo.toml +++ b/programs/bpf_loader/Cargo.toml @@ -20,10 +20,6 @@ solana-sdk = { path = "../../sdk", version = "1.2.0" } solana_rbpf = "=0.1.25" thiserror = "1.0" -[dev-dependencies] -serial_test = "0.4.0" -serial_test_derive = "0.4.0" - [lib] crate-type = ["lib", "cdylib"] name = "solana_bpf_loader_program" diff --git a/programs/bpf_loader/src/helpers.rs b/programs/bpf_loader/src/helpers.rs index 99f0d87c04..8cce6a532e 100644 --- a/programs/bpf_loader/src/helpers.rs +++ b/programs/bpf_loader/src/helpers.rs @@ -258,7 +258,6 @@ impl HelperObject for HelperSolAllocFree { #[cfg(test)] mod tests { use super::*; - use serial_test_derive::serial; use solana_sdk::{ instruction::{AccountMeta, Instruction}, pubkey::Pubkey, @@ -404,10 +403,10 @@ mod tests { .unwrap(); } - // Serialize this test: solana_logger conflicts when running tests concurrently, + // Ignore this test: solana_logger conflicts when running tests concurrently, // this results in the bad string length being ignored and not returning an error #[test] - #[serial] + #[ignore] fn test_helper_sol_log() { let string = "Gaggablaghblagh!"; let addr = string.as_ptr() as *const _ as u64; @@ -432,10 +431,10 @@ mod tests { .unwrap_err(); } - // Serialize this test: solana_logger conflicts when running tests concurrently, + // Ignore this test: solana_logger conflicts when running tests concurrently, // this results in the bad string length being ignored and not returning an error #[test] - #[serial] + #[ignore] fn test_helper_sol_log_u64() { solana_logger::setup_with_default("solana=info");