SYS-OSS/FRET-LibAFL
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix CI (#681)

Browse Source 
* Update test_all_fuzzers.sh

* --

* fix ui.rs

* fix

Co-authored-by: Dominik Maier <dmnk@google.com>
This commit is contained in:
Dongjia Zhang 2022-06-27 23:19:15 +09:00 committed by GitHub
parent 49de0046e8
commit fd9d126124
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
libafl/src/monitors/tui/ui.rs
View File

@ -132,14 +132,12 @@ impl TuiUI {
let tabs = Tabs::new(titles) let tabs = Tabs::new(titles)
.block( .block(
Block::default() Block::default()
.title( .title(Span::styled(
Span::styled( "charts (`g` switch)",
"charts (`g` switch)", Style::default()
Style::default() .fg(Color::LightCyan)
.fg(Color::LightCyan) .add_modifier(Modifier::BOLD),
.add_modifier(Modifier::BOLD), ))
),
)
.borders(Borders::ALL), .borders(Borders::ALL),
) )
.highlight_style(Style::default().fg(Color::LightYellow)) .highlight_style(Style::default().fg(Color::LightYellow))
@ -277,14 +275,12 @@ impl TuiUI {
let chart = Chart::new(datasets) let chart = Chart::new(datasets)
.block( .block(
Block::default() Block::default()
.title( .title(Span::styled(
Span::styled( title,
title, Style::default()
Style::default() .fg(Color::LightCyan)
.fg(Color::LightCyan) .add_modifier(Modifier::BOLD),
.add_modifier(Modifier::BOLD), ))
),
)
.borders(Borders::ALL), .borders(Borders::ALL),
) )
.x_axis( .x_axis(
@ -361,14 +357,12 @@ impl TuiUI {
let table = Table::new(items) let table = Table::new(items)
.block( .block(
Block::default() Block::default()
.title( .title(Span::styled(
Span::styled( "generic",
"generic", Style::default()
Style::default() .fg(Color::LightCyan)
.fg(Color::LightCyan) .add_modifier(Modifier::BOLD),
.add_modifier(Modifier::BOLD), ))
),
)
.borders(Borders::ALL), .borders(Borders::ALL),
) )
.widths(&[Constraint::Ratio(1, 2), Constraint::Ratio(1, 2)]); .widths(&[Constraint::Ratio(1, 2), Constraint::Ratio(1, 2)]);
@ -474,19 +468,18 @@ impl TuiUI {
}; };
} }
let table = let table = Table::new(items)
Table::new(items) .block(
.block( Block::default()
Block::default() .title(Span::styled(
.title(Span::styled( "introspection",
"introspection", Style::default()
Style::default() .fg(Color::LightCyan)
.fg(Color::LightCyan) .add_modifier(Modifier::BOLD),
.add_modifier(Modifier::BOLD), ))
)) .borders(Borders::ALL),
.borders(Borders::ALL), )
) .widths(&[Constraint::Ratio(1, 2), Constraint::Ratio(1, 2)]);
.widths(&[Constraint::Ratio(1, 2), Constraint::Ratio(1, 2)]);
f.render_widget(table, client_chunks[1]); f.render_widget(table, client_chunks[1]);
} }
} }
@ -503,14 +496,12 @@ impl TuiUI {
.map(|msg| ListItem::new(Span::raw(msg))) .map(|msg| ListItem::new(Span::raw(msg)))
.collect(); .collect();
let logs = List::new(logs).block( let logs = List::new(logs).block(
Block::default().borders(Borders::ALL).title( Block::default().borders(Borders::ALL).title(Span::styled(
Span::styled( "clients logs (`t` to show/hide)",
"clients logs (`t` to show/hide)", Style::default()
Style::default() .fg(Color::LightCyan)
.fg(Color::LightCyan) .add_modifier(Modifier::BOLD),
.add_modifier(Modifier::BOLD), )),
),
),
); );
f.render_widget(logs, area); f.render_widget(logs, area);
} }

4
scripts/test_all_fuzzers.sh
View File

@ -5,7 +5,7 @@ cd "$SCRIPT_DIR/.." || exit 1
# TODO: This should be rewritten in rust, a Makefile, or some platform-independent language # TODO: This should be rewritten in rust, a Makefile, or some platform-independent language
fuzzers=$(find ./fuzzers -maxdepth 1 -type d) fuzzers=$(find ./fuzzers/* -maxdepth 0 -type d)
backtrace_fuzzers=$(find ./fuzzers/backtrace_baby_fuzzers -maxdepth 1 -type d) backtrace_fuzzers=$(find ./fuzzers/backtrace_baby_fuzzers -maxdepth 1 -type d)
libafl=$(pwd) libafl=$(pwd)
@ -34,7 +34,7 @@ do
if [ "$1" != "--no-fmt" ]; then if [ "$1" != "--no-fmt" ]; then
echo "[*] Checking fmt for $fuzzer" echo "[*] Checking fmt for $fuzzer"
cargo fmt --all -- --check || exit 1 cargo fmt --check || exit 1
echo "[*] Running clippy for $fuzzer" echo "[*] Running clippy for $fuzzer"
cargo clippy || exit 1 cargo clippy || exit 1
else else