From f3d81566e3390b461a2cddb1e735d19562a21efe Mon Sep 17 00:00:00 2001
From: bmc-msft <41130664+bmc-msft@users.noreply.github.com>
Date: Wed, 20 Jan 2021 15:34:25 -0500
Subject: [PATCH] add expanding {tools_dir} to supervisor_options and
 supervisor_env (#444)

Fixes #443
---
 src/agent/onefuzz-agent/src/tasks/fuzz/supervisor.rs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/agent/onefuzz-agent/src/tasks/fuzz/supervisor.rs b/src/agent/onefuzz-agent/src/tasks/fuzz/supervisor.rs
index 900ebda11..37dab704f 100644
--- a/src/agent/onefuzz-agent/src/tasks/fuzz/supervisor.rs
+++ b/src/agent/onefuzz-agent/src/tasks/fuzz/supervisor.rs
@@ -103,6 +103,7 @@ pub async fn spawn(config: SupervisorConfig) -> Result<(), Error> {
         &config.supervisor_env,
         &config.supervisor_input_marker,
         &config.common.setup_dir,
+        &config.tools.path,
     )
     .await?;
 
@@ -158,6 +159,7 @@ async fn start_supervisor(
     supervisor_env: &HashMap<String, String>,
     supervisor_input_marker: &Option<String>,
     setup_dir: impl AsRef<Path>,
+    tools_dir: impl AsRef<Path>,
 ) -> Result<Child> {
     let mut cmd = Command::new(supervisor_path.as_ref());
 
@@ -176,7 +178,8 @@ async fn start_supervisor(
         .target_exe(target_exe)
         .target_options(target_options)
         .input_corpus(inputs_dir)
-        .setup_dir(setup_dir);
+        .setup_dir(setup_dir)
+        .tools_dir(tools_dir);
 
     if let Some(input_marker) = supervisor_input_marker {
         expand.input_marker(input_marker);
@@ -279,7 +282,8 @@ mod tests {
             &supervisor_options,
             &supervisor_env,
             &supervisor_input_marker,
-            None,
+            PathBuf::default(),
+            PathBuf::default(),
         )
         .await
         .unwrap();