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

Fix build checks

Browse Source
This commit is contained in:
Kanan Boubion
2023-10-09 10:04:50 -07:00
parent b0e4163307
commit 63b36cb065
8 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,7 +60,7 @@ impl GetExpand for Config {
.output_dir(&self.analysis.local_path) .output_dir(&self.analysis.local_path)
.set_optional(self.tools.clone().map(|t| t.local_path), Expand::tools_dir) .set_optional(self.tools.clone().map(|t| t.local_path), Expand::tools_dir)
.set_optional_ref(&self.reports, |expand, reports| { .set_optional_ref(&self.reports, |expand, reports| {
expand.reports_dir(&reports.local_path.as_path()) expand.reports_dir(reports.local_path.as_path())
}) })
.set_optional_ref(&self.crashes, |expand, crashes| { .set_optional_ref(&self.crashes, |expand, crashes| {
expand expand
@ -350,7 +350,7 @@ mod tests {
let params = config.get_expand_fields(); let params = config.get_expand_fields();
for (param, expected) in params.iter() { for (param, expected) in params.iter() {
let evaluated = expand.evaluate_value(format!("{}", param.get_string())).unwrap(); let evaluated = expand.evaluate_value(param.get_string()).unwrap();
assert_eq!(evaluated, *expected, "placeholder {} did not match expected value", param.get_string()); assert_eq!(evaluated, *expected, "placeholder {} did not match expected value", param.get_string());
} }
} }

2
src/agent/onefuzz-task/src/tasks/config.rs
View File

@ -454,7 +454,7 @@ mod tests {
let params = config.get_expand_fields(); let params = config.get_expand_fields();
for (param, expected) in params.iter() { for (param, expected) in params.iter() {
let evaluated = expand.evaluate_value(format!("{}", param.get_string())).unwrap(); let evaluated = expand.evaluate_value(param.get_string()).unwrap();
assert_eq!(evaluated, *expected); assert_eq!(evaluated, *expected);
} }
} }

2
src/agent/onefuzz-task/src/tasks/coverage/dotnet.rs
View File

@ -515,7 +515,7 @@ mod tests {
let params = config.get_expand_fields(); let params = config.get_expand_fields();
for (param, expected) in params.iter() { for (param, expected) in params.iter() {
let evaluated = expand.evaluate_value(format!("{}", param.get_string())).unwrap(); let evaluated = expand.evaluate_value(param.get_string()).unwrap();
assert_eq!(evaluated, *expected, "placeholder {} did not match expected value", param.get_string()); assert_eq!(evaluated, *expected, "placeholder {} did not match expected value", param.get_string());
} }
} }

2
src/agent/onefuzz-task/src/tasks/coverage/generic.rs
View File

@ -644,7 +644,7 @@ mod tests {
let params = config.get_expand_fields(); let params = config.get_expand_fields();
for (param, expected) in params.iter() { for (param, expected) in params.iter() {
let evaluated = expand.evaluate_value(format!("{}", param.get_string())).unwrap(); let evaluated = expand.evaluate_value(param.get_string()).unwrap();
assert_eq!(evaluated, *expected, "placeholder {} did not match expected value", param.get_string()); assert_eq!(evaluated, *expected, "placeholder {} did not match expected value", param.get_string());
} }
} }

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

@ -287,7 +287,7 @@ mod tests {
let params = config.get_expand_fields(); let params = config.get_expand_fields();
for (param, expected) in params.iter() { for (param, expected) in params.iter() {
let evaluated = expand.evaluate_value(format!("{}", param.get_string())).unwrap(); let evaluated = expand.evaluate_value(param.get_string()).unwrap();
assert_eq!(evaluated, *expected, "placeholder {} did not match expected value", param.get_string()); assert_eq!(evaluated, *expected, "placeholder {} did not match expected value", param.get_string());
} }
} }

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

@ -74,7 +74,7 @@ impl GetExpand for SupervisorConfig {
expand.input_marker(input_marker) expand.input_marker(input_marker)
}) })
.set_optional_ref(&self.target_options, |expand, target_options| { .set_optional_ref(&self.target_options, |expand, target_options| {
expand.target_options(&target_options) expand.target_options(target_options)
}) })
.set_optional_ref(&self.tools, |expand, tools| { .set_optional_ref(&self.tools, |expand, tools| {
expand.tools_dir(&tools.local_path) expand.tools_dir(&tools.local_path)
@ -301,7 +301,7 @@ async fn start_supervisor(
expand.crashdumps(&crashdumps.local_path) expand.crashdumps(&crashdumps.local_path)
}) })
.set_optional_ref(&target_exe, |expand, target_exe| { .set_optional_ref(&target_exe, |expand, target_exe| {
expand.target_exe(&target_exe) expand.target_exe(target_exe)
}); });
let supervisor_path = expand.evaluate_value(&config.supervisor_exe)?; let supervisor_path = expand.evaluate_value(&config.supervisor_exe)?;
@ -360,7 +360,7 @@ mod tests {
if let Some(target_exe) = &self.target_exe { if let Some(target_exe) = &self.target_exe {
params.push(( params.push((
PlaceHolder::TargetExe, PlaceHolder::TargetExe,
dunce::canonicalize(&target_exe) dunce::canonicalize(target_exe)
.unwrap() .unwrap()
.to_string_lossy() .to_string_lossy()
.to_string(), .to_string(),
@ -431,7 +431,7 @@ mod tests {
let params = config.get_expand_fields(); let params = config.get_expand_fields();
for (param, expected) in params.iter() { for (param, expected) in params.iter() {
let evaluated = expand.evaluate_value(format!("{}", param.get_string())).unwrap(); let evaluated = expand.evaluate_value(param.get_string()).unwrap();
assert_eq!(evaluated, *expected, "placeholder {} did not match expected value", param.get_string()); assert_eq!(evaluated, *expected, "placeholder {} did not match expected value", param.get_string());
} }
} }

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

@ -244,7 +244,7 @@ mod tests {
let params = config.get_expand_fields(); let params = config.get_expand_fields();
for (param, expected) in params.iter() { for (param, expected) in params.iter() {
let evaluated = expand.evaluate_value(format!("{}", param.get_string())).unwrap(); let evaluated = expand.evaluate_value(param.get_string()).unwrap();
assert_eq!(evaluated, *expected, "placeholder {} did not match expected value", param.get_string()); assert_eq!(evaluated, *expected, "placeholder {} did not match expected value", param.get_string());
} }
} }

6
src/agent/onefuzz-task/src/tasks/report/dotnet/generic.rs
View File

@ -60,7 +60,7 @@ pub struct Config {
} }
impl GetExpand for Config { impl GetExpand for Config {
fn get_expand<'a>(&'a self) -> Result<Expand<'a>> { fn get_expand(&self) -> Result<Expand<'_>> {
let tools_dir = self.tools.local_path.to_string_lossy().into_owned(); let tools_dir = self.tools.local_path.to_string_lossy().into_owned();
Ok(self Ok(self
@ -70,7 +70,7 @@ impl GetExpand for Config {
.target_options(&self.target_options) .target_options(&self.target_options)
.tools_dir(tools_dir) .tools_dir(tools_dir)
.set_optional_ref(&self.reports, |expand, reports| { .set_optional_ref(&self.reports, |expand, reports| {
expand.reports_dir(&reports.local_path.as_path()) expand.reports_dir(reports.local_path.as_path())
}) })
.set_optional_ref(&self.crashes, |expand, crashes| { .set_optional_ref(&self.crashes, |expand, crashes| {
expand expand
@ -359,7 +359,7 @@ mod tests {
let params = config.get_expand_fields(); let params = config.get_expand_fields();
for (param, expected) in params.iter() { for (param, expected) in params.iter() {
let evaluated = expand.evaluate_value(format!("{}", param.get_string())).unwrap(); let evaluated = expand.evaluate_value(param.get_string()).unwrap();
assert_eq!(evaluated, *expected, "placeholder {} did not match expected value", param.get_string()); assert_eq!(evaluated, *expected, "placeholder {} did not match expected value", param.get_string());
} }
} }