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

Still fixing ci (#683)

Browse Source 
* fix

* fix

* more

* cargo fixed??

* fixed??

* clp

* fix
This commit is contained in:
Dongjia Zhang 2022-06-28 16:56:28 +09:00 committed by GitHub
parent fd9d126124
commit 405a1919b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fuzzers/fuzzbench_fork_qemu/src/fuzzer.rs
View File

@ -319,7 +319,7 @@ fn fuzz(
ExitKind::Ok ExitKind::Ok
}; };
let hooks = QemuHooks::new( let mut hooks = QemuHooks::new(
&emu, &emu,
tuple_list!( tuple_list!(
QemuEdgeCoverageChildHelper::default(), QemuEdgeCoverageChildHelper::default(),
@ -328,7 +328,7 @@ fn fuzz(
); );
let executor = QemuForkExecutor::new( let executor = QemuForkExecutor::new(
hooks, &mut hooks,
&mut harness, &mut harness,
tuple_list!(edges_observer, time_observer), tuple_list!(edges_observer, time_observer),
&mut fuzzer, &mut fuzzer,

42
libafl_qemu/build_linux.rs
View File

@ -253,29 +253,25 @@ pub fn build() {
println!("cargo:rustc-env=LD_LIBRARY_PATH={}", target_dir.display()); println!("cargo:rustc-env=LD_LIBRARY_PATH={}", target_dir.display());
} */ } */
drop( assert!(Command::new("make")
assert!(Command::new("make") .current_dir(&out_dir_path)
.current_dir(&out_dir_path) .env("CC", &cross_cc)
.env("CC", &cross_cc) .env("OUT_DIR", &target_dir)
.env("OUT_DIR", &target_dir) .arg("-C")
.arg("-C") .arg(&qasan_dir)
.arg(&qasan_dir) .arg("clean")
.arg("clean") .status()
.status() .expect("make failed")
.expect("make failed") .success());
.success()) assert!(Command::new("make")
); .current_dir(&out_dir_path)
drop( .env("CC", &cross_cc)
assert!(Command::new("make") .env("OUT_DIR", &target_dir)
.current_dir(&out_dir_path) .arg("-C")
.env("CC", &cross_cc) .arg(&qasan_dir)
.env("OUT_DIR", &target_dir) .status()
.arg("-C") .expect("make failed")
.arg(&qasan_dir) .success());
.status()
.expect("make failed")
.success())
);
cc::Build::new() cc::Build::new()
.warnings(false) .warnings(false)

1
libafl_qemu/src/emu.rs
View File

@ -704,6 +704,7 @@ impl Emulator {
} }
} }
#[allow(clippy::type_complexity)]
pub fn add_gdb_cmd(&self, callback: Box<dyn FnMut(&Self, &str) -> bool>) { pub fn add_gdb_cmd(&self, callback: Box<dyn FnMut(&Self, &str) -> bool>) {
unsafe { unsafe {
GDB_COMMANDS.push(core::mem::transmute(callback)); GDB_COMMANDS.push(core::mem::transmute(callback));

1
libafl_qemu/src/lib.rs
View File

@ -11,6 +11,7 @@
#![allow(clippy::too_many_arguments)] #![allow(clippy::too_many_arguments)]
// Till they fix this buggy lint in clippy // Till they fix this buggy lint in clippy
#![allow(clippy::borrow_as_ptr)] #![allow(clippy::borrow_as_ptr)]
#![allow(clippy::borrow_deref_ref)]
// Allow only ATM, it will be evetually removed // Allow only ATM, it will be evetually removed
#![allow(clippy::missing_safety_doc)] #![allow(clippy::missing_safety_doc)]

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 0 -type d) fuzzers=$(find ./fuzzers -maxdepth 1 -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 --check || exit 1 cargo fmt --all -- --check || exit 1
echo "[*] Running clippy for $fuzzer" echo "[*] Running clippy for $fuzzer"
cargo clippy || exit 1 cargo clippy || exit 1
else else