Merge pull request #450 from madsmtm/move-fuzzing

Move fuzzing crate

Author: madsmtm

.github/workflows/ci.yml

@@ -733,11 +733,11 @@ jobs:
       with:
         path: ~/.cargo/bin/cargo-fuzz
         # Change this key if we update the required cargo-fuzz version
-        key: cargo-fuzz-${{ github.job }}-${{ matrix.name }}-v0-11-1
+        key: cargo-fuzz-${{ github.job }}-${{ matrix.name }}-v0-11-2
 
     - name: Install cargo-fuzz
       if: ${{ matrix.fuzz && steps.fuzz-cache.outputs.cache-hit != 'true' }}
-      run: cargo install cargo-fuzz --version=^0.11.1
+      run: cargo install cargo-fuzz --version=^0.11.2
 
     - name: Test Foundation
       run: cargo test $ARGS --features=$INTERESTING_FEATURES,catch-all,Foundation
@@ -754,14 +754,14 @@ jobs:
     - name: Run fuzzing
       if: ${{ matrix.fuzz }}
       run: |
-        # Run each target for 100000 runs (approx. 5 seconds), and timeout
-        # after 2 seconds.
+        # Run each fuzz target for 100000 runs (approx. 5 seconds), and
+        # timeout after 2 seconds.
         #
         # We specify the number of runs explicitly instead of using
         # `max_total_time`, to get more determinism.
-        for target in $(cargo-fuzz list)
+        for fuzz_target in $(cargo-fuzz list --fuzz-dir=./crates/test-fuzz/)
         do
-          cargo-fuzz run $target $ARGS -- -runs=10000 -timeout=2 -jobs=10
+          cargo-fuzz run --fuzz-dir=./crates/test-fuzz/ $fuzz_target $ARGS,fuzz-all -- -runs=10000 -timeout=2 -jobs=10
         done
 
         # Check if the fuzzer encountered something that should be added to

Cargo.lock

@@ -0,0 +1,52 @@
+[package]
+name = "test-fuzz"
+version = "0.0.0"
+publish = false
+edition = "2021"
+
+[package.metadata]
+cargo-fuzz = true
+
+[dependencies]
+libfuzzer-sys = "0.4"
+objc2 = { path = "../objc2", default-features = false }
+icrate = { path = "../icrate", default-features = false }
+
+[features]
+default = ["apple", "std"]
+std = ["icrate/std"]
+# Runtime
+apple = ["icrate/apple"]
+gnustep-1-7 = ["icrate/gnustep-1-7"]
+gnustep-1-8 = ["gnustep-1-7", "icrate/gnustep-1-8"]
+gnustep-1-9 = ["gnustep-1-8", "icrate/gnustep-1-9"]
+gnustep-2-0 = ["gnustep-1-9", "icrate/gnustep-2-0"]
+gnustep-2-1 = ["gnustep-2-0", "icrate/gnustep-2-1"]
+
+# The features required for fuzzing all targets (used by CI)
+fuzz-all = ["icrate/Foundation", "icrate/Foundation_NSString"]
+
+[[bin]]
+name = "class"
+path = "fuzz_targets/class.rs"
+test = false
+doc = false
+
+[[bin]]
+name = "sel"
+path = "fuzz_targets/sel.rs"
+test = false
+doc = false
+
+[[bin]]
+name = "encoding_parse"
+path = "fuzz_targets/encoding_parse.rs"
+test = false
+doc = false
+
+[[bin]]
+name = "nsstring"
+path = "fuzz_targets/nsstring.rs"
+test = false
+doc = false
+required-features = ["icrate/Foundation", "icrate/Foundation_NSString"]

fuzz/.gitignore renamed to crates/test-fuzz/.gitignore

@@ -0,0 +1,7 @@
+# Fuzzing `objc2`
+
+Run using `cargo-fuzz` (note: you must specify the `--fuzz-dir` argument).
+
+```sh
+cargo +nightly fuzz run --fuzz-dir=crates/test-fuzz/ $fuzz_target
+```