From 7f5330599bcad8b148d108a165126dd529a8684e Mon Sep 17 00:00:00 2001 From: Markus Pettersson Date: Tue, 12 Dec 2023 14:02:21 +0100 Subject: [PATCH 1/2] Override `CARGO_TARGET_DIR` --- test/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/test/build.sh b/test/build.sh index 3c598ed4e7a2..133120e6f7af 100755 --- a/test/build.sh +++ b/test/build.sh @@ -15,6 +15,7 @@ if [[ $TARGET == x86_64-unknown-linux-gnu ]]; then -v "${SCRIPT_DIR}/.container/cargo-registry":/root/.cargo/registry \ -v "${APP_DIR}":/src:Z \ -e CARGO_HOME=/root/.cargo/registry \ + -e CARGO_TARGET_DIR=/src/test/target \ mullvadvpn-app-tests \ /bin/bash -c "cd /src/test/; cargo build --bin test-runner --release --target ${TARGET}" else From 0018bdaf1dd5c067372ef2d015be31b636f10f05 Mon Sep 17 00:00:00 2001 From: Markus Pettersson Date: Tue, 12 Dec 2023 14:27:25 +0100 Subject: [PATCH 2/2] Fix `stop_app` RPC for macos --- test/test-runner/src/sys.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test-runner/src/sys.rs b/test/test-runner/src/sys.rs index 562c608120bb..7363e38e7267 100644 --- a/test/test-runner/src/sys.rs +++ b/test/test-runner/src/sys.rs @@ -301,7 +301,7 @@ pub async fn stop_app() -> Result<(), test_rpc::Error> { /// This function waits for the app to successfully start again. #[cfg(target_os = "macos")] pub async fn start_app() -> Result<(), test_rpc::Error> { - set_launch_daemon_state(false).await?; + set_launch_daemon_state(true).await?; tokio::time::sleep(std::time::Duration::from_millis(1000)).await; Ok(()) }