From 090327868d8beeeb38bc45de961550a815bcf5b0 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 20 Dec 2023 16:15:40 +0100 Subject: [PATCH] show the piped message if any --- fuzz/fuzz_targets/fuzz_common.rs | 4 ++++ fuzz/fuzz_targets/fuzz_echo.rs | 1 + fuzz/fuzz_targets/fuzz_expr.rs | 1 + fuzz/fuzz_targets/fuzz_printf.rs | 1 + fuzz/fuzz_targets/fuzz_seq.rs | 1 + fuzz/fuzz_targets/fuzz_test.rs | 1 + 6 files changed, 9 insertions(+) diff --git a/fuzz/fuzz_targets/fuzz_common.rs b/fuzz/fuzz_targets/fuzz_common.rs index 615b7b6480..11b75a2fa0 100644 --- a/fuzz/fuzz_targets/fuzz_common.rs +++ b/fuzz/fuzz_targets/fuzz_common.rs @@ -293,12 +293,16 @@ pub fn run_gnu_cmd( pub fn compare_result( test_type: &str, input: &str, + pipe_input: Option<&str>, rust_result: &CommandResult, gnu_result: &CommandResult, fail_on_stderr_diff: bool, ) { println!("Test Type: {}", test_type); println!("Input: {}", input); + if let Some(pipe) = pipe_input { + println!("Pipe: {}", pipe); + } let mut discrepancies = Vec::new(); let mut should_panic = false; diff --git a/fuzz/fuzz_targets/fuzz_echo.rs b/fuzz/fuzz_targets/fuzz_echo.rs index 4a81b989a5..3f15b257e6 100644 --- a/fuzz/fuzz_targets/fuzz_echo.rs +++ b/fuzz/fuzz_targets/fuzz_echo.rs @@ -78,6 +78,7 @@ fuzz_target!(|_data: &[u8]| { compare_result( "echo", &format!("{:?}", &args[1..]), + None, &rust_result, &gnu_result, true, diff --git a/fuzz/fuzz_targets/fuzz_expr.rs b/fuzz/fuzz_targets/fuzz_expr.rs index bcb94de73f..cc0856edfd 100644 --- a/fuzz/fuzz_targets/fuzz_expr.rs +++ b/fuzz/fuzz_targets/fuzz_expr.rs @@ -86,6 +86,7 @@ fuzz_target!(|_data: &[u8]| { compare_result( "expr", &format!("{:?}", &args[1..]), + None, &rust_result, &gnu_result, false, // Set to true if you want to fail on stderr diff diff --git a/fuzz/fuzz_targets/fuzz_printf.rs b/fuzz/fuzz_targets/fuzz_printf.rs index 2f7e09cb7b..72fac540b1 100644 --- a/fuzz/fuzz_targets/fuzz_printf.rs +++ b/fuzz/fuzz_targets/fuzz_printf.rs @@ -99,6 +99,7 @@ fuzz_target!(|_data: &[u8]| { compare_result( "printf", &format!("{:?}", &args[1..]), + None, &rust_result, &gnu_result, false, // Set to true if you want to fail on stderr diff diff --git a/fuzz/fuzz_targets/fuzz_seq.rs b/fuzz/fuzz_targets/fuzz_seq.rs index 8dd5db40cb..7bb4f8af95 100644 --- a/fuzz/fuzz_targets/fuzz_seq.rs +++ b/fuzz/fuzz_targets/fuzz_seq.rs @@ -67,6 +67,7 @@ fuzz_target!(|_data: &[u8]| { compare_result( "seq", &format!("{:?}", &args[1..]), + None, &rust_result, &gnu_result, false, // Set to true if you want to fail on stderr diff diff --git a/fuzz/fuzz_targets/fuzz_test.rs b/fuzz/fuzz_targets/fuzz_test.rs index f9f077c443..bed7ca7708 100644 --- a/fuzz/fuzz_targets/fuzz_test.rs +++ b/fuzz/fuzz_targets/fuzz_test.rs @@ -203,6 +203,7 @@ fuzz_target!(|_data: &[u8]| { compare_result( "test", &format!("{:?}", &args[1..]), + None, &rust_result, &gnu_result, false, // Set to true if you want to fail on stderr diff