Add `--test-runner-dir` flag

2 files changed, 3 insertions, 16 deletions

diff --git a/test/test-manager/src/vm/mod.rs b/test/test-manager/src/vm/mod.rs
index 6cb18c9c5f..49c09da6f9 100644
--- a/test/test-manager/src/vm/mod.rs
+++ b/test/test-manager/src/vm/mod.rs
@@ -1,10 +1,7 @@
 use anyhow::{Context, Result};
 use std::net::IpAddr;
 
-use crate::{
-    config::{Config, ConfigFile, VmConfig, VmType},
-    package,
-};
+use crate::config::{Config, ConfigFile, VmConfig, VmType};
 
 mod logging;
 pub mod network;
@@ -63,17 +60,6 @@ pub async fn run(config: &Config, name: &str) -> Result<Box<dyn VmInstance>> {
     Ok(instance)
 }
 
-/// Returns the directory in the test runner where the test-runner binary is installed.
-pub async fn provision(
-    config: &Config,
-    name: &str,
-    instance: &dyn VmInstance,
-    app_manifest: &package::Manifest,
-) -> Result<String> {
-    let vm_config = get_vm_config(config, name)?;
-    provision::provision(vm_config, instance, app_manifest).await
-}
-
 pub async fn update_packages(
     config: VmConfig,
     instance: &dyn VmInstance,
diff --git a/test/test-manager/src/vm/provision.rs b/test/test-manager/src/vm/provision.rs
index 067a4dd900..e5786b54d7 100644
--- a/test/test-manager/src/vm/provision.rs
+++ b/test/test-manager/src/vm/provision.rs
@@ -16,6 +16,7 @@ pub async fn provision(
     config: &VmConfig,
     instance: &dyn super::VmInstance,
     app_manifest: &package::Manifest,
+    runner_dir: PathBuf,
 ) -> Result<String> {
     match config.provisioner {
         Provisioner::Ssh => {
@@ -25,7 +26,7 @@ pub async fn provision(
             provision_ssh(
                 instance,
                 config.os_type,
-                &config.get_runner_dir(),
+                &runner_dir,
                 app_manifest,
                 user,
                 password,