ExternalVendorCode/onefuzz
1
0
Fork 0
mirror of https://github.com/microsoft/onefuzz.git synced 2025-06-18 12:48:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

add expanding {tools_dir} to supervisor_options and supervisor_env (#444)

Browse Source 
Fixes #443
This commit is contained in:
bmc-msft
2021-01-20 15:34:25 -05:00
committed by GitHub
parent fd956380d4
commit f3d81566e3
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/agent/onefuzz-agent/src/tasks/fuzz/supervisor.rs
View File

@ -103,6 +103,7 @@ pub async fn spawn(config: SupervisorConfig) -> Result<(), Error> {
&config.supervisor_env, &config.supervisor_env,
&config.supervisor_input_marker, &config.supervisor_input_marker,
&config.common.setup_dir, &config.common.setup_dir,
&config.tools.path,
) )
.await?; .await?;
@ -158,6 +159,7 @@ async fn start_supervisor(
supervisor_env: &HashMap<String, String>, supervisor_env: &HashMap<String, String>,
supervisor_input_marker: &Option<String>, supervisor_input_marker: &Option<String>,
setup_dir: impl AsRef<Path>, setup_dir: impl AsRef<Path>,
tools_dir: impl AsRef<Path>,
) -> Result<Child> { ) -> Result<Child> {
let mut cmd = Command::new(supervisor_path.as_ref()); let mut cmd = Command::new(supervisor_path.as_ref());
@ -176,7 +178,8 @@ async fn start_supervisor(
.target_exe(target_exe) .target_exe(target_exe)
.target_options(target_options) .target_options(target_options)
.input_corpus(inputs_dir) .input_corpus(inputs_dir)
.setup_dir(setup_dir); .setup_dir(setup_dir)
.tools_dir(tools_dir);
if let Some(input_marker) = supervisor_input_marker { if let Some(input_marker) = supervisor_input_marker {
expand.input_marker(input_marker); expand.input_marker(input_marker);
@ -279,7 +282,8 @@ mod tests {
&supervisor_options, &supervisor_options,
&supervisor_env, &supervisor_env,
&supervisor_input_marker, &supervisor_input_marker,
None, PathBuf::default(),
PathBuf::default(),
) )
.await .await
.unwrap(); .unwrap();