Skip to content
This repository has been archived by the owner on Nov 1, 2023. It is now read-only.

add setup_dir to generator task #901

Merged
2 commits merged into from
May 19, 2021
Merged

add setup_dir to generator task #901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18fb9e9
add setup_dir to generator task
May 18, 2021
0270569
Merge branch 'main' into add-setup-dir-to-generator-tasks
bmc-msft May 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions docs/command-replacements.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,19 +47,25 @@ If you need `supervisor_options` to expand to: `"a", "b", "c", "d"`, you should

These are currently used in the following tasks:

* libfuzzer\_fuzz: `target_exe`, `target_options`, `input_corpus`, `crashes`
* libfuzzer\_crash\_report: `target_exe`, `target_options`, `input`
* libfuzzer\_merge: `target_exe`, `target_options`, `input_corpus`
* libfuzzer\_fuzz: `target_exe`, `target_options`, `input_corpus`, `crashes`,
`setup_dir`
* libfuzzer\_crash\_report: `target_exe`, `target_options`, `input`,
`setup_dir`
* libfuzzer\_merge: `target_exe`, `target_options`, `input_corpus`, `setup_dir`
* libfuzzer\_coverage: None
* generic\_analysis: `input`, `target_exe`, `target_options`, `analyzer_exe`,
`analyzer_options`, `output_dir`, `tools_dir`, `job_id`, `task_id`,
`crashes_account`, `crashes_container`, `reports_dir`, `microsoft_telemetry_key`, `instance_telemetry_key`
`crashes_account`, `crashes_container`, `reports_dir`,
`microsoft_telemetry_key`, `instance_telemetry_key`, `setup_dir`
* generic\_generator: `generated_inputs`, `input_corpus`, `tools_dir`,
`generator_exe`, `generator_options`, `target_exe`, `target_options`,
`input`, `job_id`, `task_id`, `microsoft_telemetry_key`, `instance_telemetry_key`
`input`, `job_id`, `task_id`, `microsoft_telemetry_key`,
`instance_telemetry_key`, `setup_dir`
* generic\_supervisor: `crashes`, `runtime_dir`, `target_exe`, `target_options`,
`input_corpus`, `input`, `supervisor_exe`, `supervisor_options`, `tools_dir`,
`job_id`, `task_id`, `crashes_account`, `crashes_container`, `reports_dir`, `microsoft_telemetry_key`, `instance_telemetry_key`
`job_id`, `task_id`, `crashes_account`, `crashes_container`, `reports_dir`,
`microsoft_telemetry_key`, `instance_telemetry_key`, `setup_dir`
* generic\_merge: `input`, `input_corpus`, `output_dir`, `target_exe`,
`target_options`, `supervisor_exe`, `supervisor_options`, `tools_dir`,
`job_id`, `task_id`, `microsoft_telemetry_key`, `instance_telemetry_key`
`job_id`, `task_id`, `microsoft_telemetry_key`, `instance_telemetry_key`,
`setup_dir`
1 change: 1 addition & 0 deletions src/agent/onefuzz-agent/src/tasks/fuzz/generator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ impl GeneratorTask {
utils::reset_tmp_dir(&output_dir).await?;
let (mut generator, generator_path) = {
let expand = Expand::new()
.setup_dir(&self.config.common.setup_dir)
.generated_inputs(&output_dir)
.input_corpus(&corpus_dir)
.generator_exe(&self.config.generator_exe)
Expand Down