Merge pull request #726 from alexcrichton/fuzz-in-workspace

Move the `fuzz` directory into main workspace

.github/workflows/main.yml

@@ -69,6 +69,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v1
+      with:
+        submodules: true
     - uses: actions/checkout@v1
       with:
         repository: bytecodealliance/wasmtime-libfuzzer-corpus

Cargo.lock

@@ -922,6 +922,15 @@ version = "0.2.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558"
 
+[[package]]
+name = "libfuzzer-sys"
+version = "0.1.0"
+source = "git+https://github.com/rust-fuzz/libfuzzer-sys.git#0c4507533a79e85e1984f59765bdd35fbdaa7f1b"
+dependencies = [
+ "arbitrary",
+ "cc",
+]
+
 [[package]]
 name = "libloading"
 version = "0.5.2"
@@ -2037,6 +2046,18 @@ dependencies = [
  "zstd",
 ]
 
+[[package]]
+name = "wasmtime-fuzz"
+version = "0.7.0"
+dependencies = [
+ "arbitrary",
+ "env_logger 0.7.1",
+ "libfuzzer-sys",
+ "log",
+ "wasmtime-fuzzing",
+ "wasmtime-jit",
+]
+
 [[package]]
 name = "wasmtime-fuzzing"
 version = "0.1.0"

Cargo.toml

@@ -53,6 +53,7 @@ members = [
   "crates/fuzzing",
   "crates/misc/rust",
   "crates/misc/py",
+  "fuzz",
 ]
 
 [features]

fuzz/Cargo.toml

@@ -16,22 +16,22 @@ wasmtime-fuzzing = { path = "../crates/fuzzing", features = ["env_logger"] }
 wasmtime-jit = { path = "../crates/jit" }
 libfuzzer-sys = { git = "https://github.com/rust-fuzz/libfuzzer-sys.git" }
 
-# Prevent this from interfering with workspaces
-[workspace]
-members = ["."]
-
 [[bin]]
 name = "compile"
 path = "fuzz_targets/compile.rs"
+test = false
 
 [[bin]]
 name = "instantiate"
 path = "fuzz_targets/instantiate.rs"
+test = false
 
 [[bin]]
 name = "instantiate_translated"
 path = "fuzz_targets/instantiate_translated.rs"
+test = false
 
 [[bin]]
 name = "api_calls"
 path = "fuzz_targets/api_calls.rs"
+test = false