Allow setting corpus and crashes dirs in cargo bolero test

.github/workflows/main.yml

@@ -44,7 +44,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        rust: [1.56.1, stable, beta, nightly]
+        rust: [1.57.0, stable, beta, nightly]
         os: [ubuntu-latest, macOS-latest]
         # TODO add honggfuzz back
         test: [unit-tests, libfuzzer, afl, examples-tests]

cargo-bolero/src/afl.rs

@@ -18,7 +18,10 @@ fn bin() -> String {
 
 pub(crate) fn test(selection: &Selection, test_args: &test::Args) -> Result<()> {
     let test_target = selection.test_target(FLAGS, "afl")?;
-    let corpus_dir = test_target.corpus_dir();
+    let corpus_dir = test_args
+        .corpus_dir
+        .clone()
+        .unwrap_or_else(|| test_target.default_corpus_dir());
     let afl_state = test_target.workdir().join("afl_state");
 
     fs::create_dir_all(&afl_state)?;

cargo-bolero/src/honggfuzz.rs

@@ -32,8 +32,14 @@ macro_rules! optional_arg {
 
 pub(crate) fn test(selection: &Selection, test_args: &test::Args) -> Result<()> {
     let test_target = selection.test_target(FLAGS, "honggfuzz")?;
-    let corpus_dir = test_target.corpus_dir();
-    let crashes_dir = test_target.crashes_dir();
+    let corpus_dir = test_args
+        .corpus_dir
+        .clone()
+        .unwrap_or_else(|| test_target.default_corpus_dir());
+    let crashes_dir = test_args
+        .crashes_dir
+        .clone()
+        .unwrap_or_else(|| test_target.default_crashes_dir());
 
     fs::create_dir_all(&corpus_dir)?;
     fs::create_dir_all(&crashes_dir)?;
@@ -73,8 +79,8 @@ pub(crate) fn test(selection: &Selection, test_args: &test::Args) -> Result<()>
 
 pub(crate) fn reduce(selection: &Selection, reduce: &reduce::Args) -> Result<()> {
     let test_target = selection.test_target(FLAGS, "honggfuzz")?;
-    let corpus_dir = test_target.corpus_dir();
-    let crashes_dir = test_target.crashes_dir();
+    let corpus_dir = test_target.default_corpus_dir();
+    let crashes_dir = test_target.default_crashes_dir();
 
     fs::create_dir_all(&corpus_dir)?;
     fs::create_dir_all(&crashes_dir)?;

cargo-bolero/src/libfuzzer.rs

@@ -28,8 +28,14 @@ const FLAGS: &[&str] = &[
 
 pub(crate) fn test(selection: &Selection, test_args: &test::Args) -> Result<()> {
     let test_target = selection.test_target(FLAGS, "libfuzzer")?;
-    let corpus_dir = test_target.corpus_dir();
-    let crashes_dir = test_target.crashes_dir();
+    let corpus_dir = test_args
+        .corpus_dir
+        .clone()
+        .unwrap_or_else(|| test_target.default_corpus_dir());
+    let crashes_dir = test_args
+        .crashes_dir
+        .clone()
+        .unwrap_or_else(|| test_target.default_crashes_dir());
 
     fs::create_dir_all(&corpus_dir)?;
     fs::create_dir_all(&crashes_dir)?;
@@ -38,6 +44,7 @@ pub(crate) fn test(selection: &Selection, test_args: &test::Args) -> Result<()>
 
     let mut args = vec![
         format!("{}", corpus_dir.display()),
+        format!("{}", crashes_dir.display()),
         format!("-artifact_prefix={}/", crashes_dir.display()),
         format!("-timeout={}", test_args.timeout_as_secs()),
     ];
@@ -61,7 +68,7 @@ pub(crate) fn test(selection: &Selection, test_args: &test::Args) -> Result<()>
 
 pub(crate) fn reduce(selection: &Selection, reduce: &reduce::Args) -> Result<()> {
     let test_target = selection.test_target(FLAGS, "libfuzzer")?;
-    let corpus_dir = test_target.corpus_dir();
+    let corpus_dir = test_target.default_corpus_dir();
     let tmp_corpus = test_target.temp_dir()?;
 
     fs::create_dir_all(&corpus_dir)?;

cargo-bolero/src/test.rs

@@ -1,6 +1,7 @@
 use crate::{engine::Engine, selection::Selection};
 use anyhow::Result;
 use humantime::Duration;
+use std::path::PathBuf;
 use structopt::StructOpt;
 
 /// Run an engine for a target
@@ -46,6 +47,14 @@ pub struct Args {
     #[structopt(short, long)]
     pub jobs: Option<usize>,
 
+    /// User-defined location for the corpus folder
+    #[structopt(long)]
+    pub corpus_dir: Option<PathBuf>,
+
+    /// User-defined location for the crashes folder
+    #[structopt(long)]
+    pub crashes_dir: Option<PathBuf>,
+
     /// Additional arguments to pass to the selected engine
     #[structopt(short = "E", long)]
     pub engine_args: Vec<String>,

cargo-bolero/src/test_target.rs

@@ -62,7 +62,7 @@ impl TestTarget {
         PathBuf::from(&self.work_dir)
     }
 
-    pub fn corpus_dir(&self) -> PathBuf {
+    pub fn default_corpus_dir(&self) -> PathBuf {
         let mut workdir = self.workdir();
         workdir.push("corpus");
         workdir
@@ -73,7 +73,7 @@ impl TestTarget {
         Ok(dir)
     }
 
-    pub fn crashes_dir(&self) -> PathBuf {
+    pub fn default_crashes_dir(&self) -> PathBuf {
         let mut workdir = self.workdir();
         workdir.push("crashes");
         workdir

rust-toolchain

@@ -1 +1 @@
-1.56.1
+1.57.0