Revert "Remove crosvm-fuzz from workspace"

This reverts commit e2171ea4b7.

Reason for revert: Breaks crosvm-fuzz builds

Original change's description:
> Remove crosvm-fuzz from workspace
>
> The fuzz binary targets do not compile upstream.
> This allows us to run all unit tests via cargo.
>
> BUG=None
> TEST=cargo test --workspace --lib --bins
>
> Change-Id: I3923c79a8d622824956599b9b8552c7d1a610b70
> Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4015006
> Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>

Bug: None
Change-Id: Iedc1a8e8335e82cf543650ae811c1e0a83668b76
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4021756
Auto-Submit: Dennis Kempin <denniskempin@google.com>
Commit-Queue: Keiichi Watanabe <keiichiw@chromium.org>
Commit-Queue: Dennis Kempin <denniskempin@google.com>
Reviewed-by: Keiichi Watanabe <keiichiw@chromium.org>
This commit is contained in:
Dennis Kempin 2022-11-11 00:40:22 +00:00 committed by crosvm LUCI
parent 9b822d76fe
commit 38bb5aef4e
2 changed files with 26 additions and 7 deletions

31
Cargo.lock generated
View file

@ -70,9 +70,9 @@ checksum = "bb07d2053ccdbe10e2af2995a2f116c1330396493dc1269f6a91d0ae82e19704"
[[package]]
name = "arbitrary"
version = "1.2.0"
version = "1.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "29d47fbf90d5149a107494b15a7dc8d69b351be2db3bb9691740e88ec17fd880"
checksum = "f44124848854b941eafdb34f05b3bcf59472f643c7e151eba7c2b69daa469ed5"
[[package]]
name = "arch"
@ -548,6 +548,25 @@ dependencies = [
"x86_64",
]
[[package]]
name = "crosvm-fuzz"
version = "0.0.1"
dependencies = [
"base",
"cros_fuzz",
"data_model",
"devices",
"disk",
"fuse",
"hypervisor",
"kernel_loader",
"libc",
"rand",
"tempfile",
"usb_util",
"vm_memory",
]
[[package]]
name = "crosvm_cli"
version = "0.1.0"
@ -1096,9 +1115,9 @@ checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d"
[[package]]
name = "jobserver"
version = "0.1.25"
version = "0.1.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b"
checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa"
dependencies = [
"libc",
]
@ -1178,9 +1197,9 @@ dependencies = [
[[package]]
name = "libfuzzer-sys"
version = "0.4.5"
version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c8fff891139ee62800da71b7fd5b508d570b9ad95e614a53c6f453ca08366038"
checksum = "ae185684fe19814afd066da15a7cc41e126886c21282934225d9fc847582da58"
dependencies = [
"arbitrary",
"cc",

View file

@ -61,6 +61,7 @@ members = [
"crosvm_cli",
"crosvm_control",
"crosvm_plugin",
"crosvm-fuzz",
"devices",
"disk",
"e2e_tests",
@ -111,7 +112,6 @@ exclude = [
"tube_transporter",
"win_audio",
"win_util",
"crosvm-fuzz",
]
[features]