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

Add task_id & job_id to variable expansion (#481)

Browse Source 
Fixes #479 

Note, this is built on top of #480
This commit is contained in:
bmc-msft
2021-01-29 10:35:59 -05:00
committed by GitHub
parent 9c7eb33149
commit 5acb59e5b9
6 changed files with 46 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/agent/onefuzz-agent/src/tasks/analysis/generic.rs
View File

@ -124,7 +124,9 @@ pub async fn run_tool(input: impl AsRef<Path>, config: &Config) -> Result<()> {
.analyzer_options(&config.analyzer_options)
.output_dir(&config.analysis.path)
.tools_dir(&config.tools.path)
.setup_dir(&config.common.setup_dir);
.setup_dir(&config.common.setup_dir)
.job_id(&config.common.job_id)
.task_id(&config.common.task_id);
let analyzer_path = expand.evaluate_value(&config.analyzer_exe)?;

4
src/agent/onefuzz-agent/src/tasks/fuzz/generator.rs
View File

@ -156,7 +156,9 @@ impl GeneratorTask {
.generated_inputs(&output_dir)
.input_corpus(&corpus_dir)
.generator_exe(&self.config.generator_exe)
.generator_options(&self.config.generator_options);
.generator_options(&self.config.generator_options)
.job_id(&self.config.common.job_id)
.task_id(&self.config.common.task_id);
if let Some(tools) = &self.config.tools {
expand.tools_dir(&tools.path);

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

@ -181,7 +181,9 @@ async fn start_supervisor(
.crashes(&crashes.path)
.input_corpus(&inputs.path)
.reports_dir(&reports_dir)
.setup_dir(&config.common.setup_dir);
.setup_dir(&config.common.setup_dir)
.job_id(&config.common.job_id)
.task_id(&config.common.task_id);
if let Some(tools) = &config.tools {
expand.tools_dir(&tools.path);

4
src/agent/onefuzz-agent/src/tasks/merge/generic.rs
View File

@ -140,7 +140,9 @@ async fn merge(config: &Config, output_dir: impl AsRef<Path>) -> Result<()> {
.generated_inputs(output_dir)
.target_exe(&config.target_exe)
.setup_dir(&config.common.setup_dir)
.tools_dir(&config.tools.path);
.tools_dir(&config.tools.path)
.job_id(&config.common.job_id)
.task_id(&config.common.task_id);
let supervisor_path = expand.evaluate_value(&config.supervisor_exe)?;