Set serial baud rate to zero on macOS

2 files changed, 12 insertions, 2 deletions

diff --git a/test/test-manager/src/run_tests.rs b/test/test-manager/src/run_tests.rs
index 756d8d8b45..7b636643ff 100644
--- a/test/test-manager/src/run_tests.rs
+++ b/test/test-manager/src/run_tests.rs
@@ -15,7 +15,12 @@ use std::time::Duration;
 use test_rpc::logging::Output;
 use test_rpc::{mullvad_daemon::MullvadClientVersion, ServiceClient};
 
-const BAUD: u32 = 115200;
+/// The baud rate of the serial connection between the test manager and the test runner.
+/// There is a known issue with setting a baud rate at all or macOS, and the workaround
+/// is to set it to zero: https://github.com/serialport/serialport-rs/pull/58
+///
+/// Keep this constant in sync with `test-runner/src/main.rs`
+const BAUD: u32 = if cfg!(target_os = "macos") { 0 } else { 115200 };
 
 pub async fn run(
     config: tests::config::TestConfig,
diff --git a/test/test-runner/src/main.rs b/test/test-runner/src/main.rs
index d7ace9d15a..1c2c301b27 100644
--- a/test/test-runner/src/main.rs
+++ b/test/test-runner/src/main.rs
@@ -299,7 +299,12 @@ fn get_pipe_status() -> ServiceStatus {
     }
 }
 
-const BAUD: u32 = 115200;
+/// The baud rate of the serial connection between the test manager and the test runner.
+/// There is a known issue with setting a baud rate at all or macOS, and the workaround
+/// is to set it to zero: https://github.com/serialport/serialport-rs/pull/58
+///
+/// Keep this constant in sync with `test-manager/src/run_tests.rs`
+const BAUD: u32 = if cfg!(target_os = "macos") { 0 } else { 115200 };
 
 #[derive(err_derive::Error, Debug)]
 pub enum Error {