RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 11:37:44 +00:00
Code Issues Activity

fuzz: adjust the fuzzers with the new arg

Browse source
This commit is contained in:
Sylvestre Ledru 2023-11-08 23:31:41 +01:00
parent 064ad7200c
commit 8ab20c4673
2 changed files with 45 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

33
fuzz/fuzz_targets/fuzz_expr.rs
View file

@ -84,7 +84,7 @@ fuzz_target!(|_data: &[u8]| {
let mut args = vec![OsString::from("expr")]; let mut args = vec![OsString::from("expr")];
args.extend(expr.split_whitespace().map(OsString::from)); args.extend(expr.split_whitespace().map(OsString::from));
let (rust_output, uumain_exit_code) = generate_and_run_uumain(&args, uumain); let (rust_stdout, rust_stderr, uumain_exit_code) = generate_and_run_uumain(&args, uumain);
// Use C locale to avoid false positives, like in https://github.com/uutils/coreutils/issues/5378, // Use C locale to avoid false positives, like in https://github.com/uutils/coreutils/issues/5378,
// because uutils expr doesn't support localization yet // because uutils expr doesn't support localization yet
@ -93,28 +93,43 @@ fuzz_target!(|_data: &[u8]| {
// Run GNU expr with the provided arguments and compare the output // Run GNU expr with the provided arguments and compare the output
match run_gnu_cmd(CMD_PATH, &args[1..], true) { match run_gnu_cmd(CMD_PATH, &args[1..], true) {
Ok((gnu_output, gnu_exit_code)) => { Ok((gnu_stdout, gnu_stderr, gnu_exit_code)) => {
let gnu_output = gnu_output.trim().to_owned(); let gnu_stdout = gnu_stdout.trim().to_owned();
if uumain_exit_code != gnu_exit_code { if uumain_exit_code != gnu_exit_code {
println!("Expression: {}", expr); println!("Expression: {}", expr);
println!("GNU stderr: {}", gnu_stderr);
println!("Rust stderr: {}", rust_stderr);
println!("Rust code: {}", uumain_exit_code); println!("Rust code: {}", uumain_exit_code);
println!("GNU code: {}", gnu_exit_code); println!("GNU code: {}", gnu_exit_code);
panic!("Different error codes"); panic!("Different error codes");
} }
if rust_output == gnu_output { if rust_stdout == gnu_stdout {
println!( println!(
"Outputs matched for expression: {} => Result: {}", "Outputs matched for expression: {} => Result: {}",
expr, rust_output expr, rust_stdout
); );
} else { } else {
println!("Expression: {}", expr); println!("Expression: {}", expr);
println!("Rust output: {}", rust_output); println!("Rust output: {}", rust_stdout);
println!("GNU output: {}", gnu_output); println!("GNU output: {}", gnu_stdout);
panic!("Different output between Rust & GNU"); panic!("Different output between Rust & GNU");
} }
} }
Err(_) => {
println!("GNU expr execution failed for expression: {}", expr); Err((_gnu_stdout, gnu_stderr, _gnu_exit_code)) => {
if rust_stderr == gnu_stderr {
println!(
"GNU execution failed for input: {} stderr: {}",
expr, rust_stderr
);
} else {
println!("Input: {}", expr);
println!("Rust stderr: {}", rust_stderr);
println!("GNU stderr: {}", gnu_stderr);
panic!("Different stderr between Rust & GNU");
}
} }
} }
}); });

29
fuzz/fuzz_targets/fuzz_test.rs
View file

@ -204,19 +204,22 @@ fuzz_target!(|_data: &[u8]| {
args.push(OsString::from(generate_test_arg())); args.push(OsString::from(generate_test_arg()));
} }
let (rust_output, uumain_exit_status) = generate_and_run_uumain(&args, uumain); let (rust_stdout, rust_stderr, uumain_exit_status) = generate_and_run_uumain(&args, uumain);
// Run GNU test with the provided arguments and compare the output // Run GNU test with the provided arguments and compare the output
match run_gnu_cmd(CMD_PATH, &args[1..], false) { match run_gnu_cmd(CMD_PATH, &args[1..], false) {
Ok((gnu_output, gnu_exit_status)) => { Ok((gnu_stdout, gnu_stderr, gnu_exit_status)) => {
let gnu_output = gnu_output.trim().to_owned(); let gnu_stdout = gnu_stdout.trim().to_owned();
println!("gnu_exit_status {}", gnu_exit_status); println!("gnu_exit_status {}", gnu_exit_status);
println!("uumain_exit_status {}", uumain_exit_status); println!("uumain_exit_status {}", uumain_exit_status);
if rust_output != gnu_output || uumain_exit_status != gnu_exit_status { if rust_stdout != gnu_stdout || uumain_exit_status != gnu_exit_status {
println!("Discrepancy detected!"); println!("Discrepancy detected!");
println!("Test: {:?}", &args[1..]); println!("Test: {:?}", &args[1..]);
println!("My output: {}", rust_output); println!("Rust output: {}", rust_stdout);
println!("GNU output: {}", gnu_output); println!("GNU output: {}", gnu_stdout);
println!("Rust stderr: {}", rust_stderr);
println!("GNU stderr: {}", gnu_stderr);
println!("My exit status: {}", uumain_exit_status); println!("My exit status: {}", uumain_exit_status);
println!("GNU exit status: {}", gnu_exit_status); println!("GNU exit status: {}", gnu_exit_status);
panic!(); panic!();
@ -227,8 +230,18 @@ fuzz_target!(|_data: &[u8]| {
); );
} }
} }
Err(_) => { Err((_gnu_stdout, gnu_stderr, _gnu_exit_code)) => {
println!("GNU test execution failed for expression {:?}", &args[1..]); if rust_stderr == gnu_stderr {
println!(
"GNU execution failed for input: {:?} stderr: {}",
args, rust_stderr
);
} else {
println!("Input: {:?}", args);
println!("Rust stderr: {}", rust_stderr);
println!("GNU stderr: {}", gnu_stderr);
panic!("Different stderr between Rust & GNU");
}
} }
} }
}); });