From 5b8f7df0c91275be8ad2c7a8ec4c9117ed614c47 Mon Sep 17 00:00:00 2001
From: Patrick Mooney <pmooney@pfmooney.com>
Date: Wed, 2 Aug 2023 12:15:16 -0500
Subject: [PATCH] Elide test (and doctest) steps where not required

---
 bin/propolis-cli/Cargo.toml                  | 2 --
 bin/propolis-server/Cargo.toml               | 5 +++--
 bin/propolis-standalone/Cargo.toml           | 2 ++
 bin/propolis-utils/Cargo.toml                | 6 ++++++
 crates/bhyve-api/Cargo.toml                  | 3 ++-
 crates/bhyve-api/sys/Cargo.toml              | 4 +++-
 crates/dladm/Cargo.toml                      | 4 +++-
 crates/propolis-server-config/Cargo.toml     | 4 +++-
 crates/propolis-standalone-config/Cargo.toml | 4 ++++
 crates/propolis-types/Cargo.toml             | 4 +++-
 crates/viona-api/Cargo.toml                  | 3 ++-
 crates/viona-api/sys/Cargo.toml              | 4 +++-
 lib/propolis-client/Cargo.toml               | 5 +++--
 lib/propolis/Cargo.toml                      | 2 --
 packaging/propolis-package/Cargo.toml        | 5 +++++
 phd-tests/framework/Cargo.toml               | 3 ++-
 phd-tests/runner/Cargo.toml                  | 5 +++++
 phd-tests/testcase/Cargo.toml                | 4 +++-
 phd-tests/testcase_macro/Cargo.toml          | 8 ++++----
 phd-tests/tests/Cargo.toml                   | 4 +++-
 xtask/Cargo.toml                             | 5 +++++
 21 files changed, 64 insertions(+), 22 deletions(-)

diff --git a/bin/propolis-cli/Cargo.toml b/bin/propolis-cli/Cargo.toml
index a00d9d3e7..39eac30d9 100644
--- a/bin/propolis-cli/Cargo.toml
+++ b/bin/propolis-cli/Cargo.toml
@@ -4,8 +4,6 @@ version = "0.1.0"
 license = "MPL-2.0"
 edition = "2021"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
 anyhow.workspace = true
 clap = { workspace = true, features = ["derive"] }
diff --git a/bin/propolis-server/Cargo.toml b/bin/propolis-server/Cargo.toml
index 55c2373f0..b545673fb 100644
--- a/bin/propolis-server/Cargo.toml
+++ b/bin/propolis-server/Cargo.toml
@@ -4,16 +4,17 @@ version = "0.1.0"
 license = "MPL-2.0"
 edition = "2021"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [lib]
 name = "propolis_server"
 path = "src/lib/lib.rs"
+doctest = false
 
 [[bin]]
 name = "propolis-server"
 path = "src/main.rs"
 doc = false
+doctest = false
+test = false
 
 [dependencies]
 atty.workspace = true
diff --git a/bin/propolis-standalone/Cargo.toml b/bin/propolis-standalone/Cargo.toml
index 2f38961ce..3493bd344 100644
--- a/bin/propolis-standalone/Cargo.toml
+++ b/bin/propolis-standalone/Cargo.toml
@@ -7,6 +7,8 @@ edition = "2021"
 [[bin]]
 name = "propolis-standalone"
 path = "src/main.rs"
+test = false
+doctest = false
 
 [dependencies]
 anyhow.workspace = true
diff --git a/bin/propolis-utils/Cargo.toml b/bin/propolis-utils/Cargo.toml
index 3201ae108..d9e73a036 100644
--- a/bin/propolis-utils/Cargo.toml
+++ b/bin/propolis-utils/Cargo.toml
@@ -6,12 +6,18 @@ edition = "2021"
 
 [[bin]]
 name = "savex"
+test = false
+doctest = false
 
 [[bin]]
 name = "cpuid-gen"
+test = false
+doctest = false
 
 [[bin]]
 name = "rsrvrctl"
+test = false
+doctest = false
 
 [dependencies]
 anyhow.workspace = true
diff --git a/crates/bhyve-api/Cargo.toml b/crates/bhyve-api/Cargo.toml
index 8657c9d44..e465f09bc 100644
--- a/crates/bhyve-api/Cargo.toml
+++ b/crates/bhyve-api/Cargo.toml
@@ -4,7 +4,8 @@ version = "0.0.0"
 license = "MPL-2.0"
 edition = "2021"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[lib]
+doctest = false
 
 [dependencies]
 libc.workspace = true
diff --git a/crates/bhyve-api/sys/Cargo.toml b/crates/bhyve-api/sys/Cargo.toml
index 4a90db84c..90b2ddc00 100644
--- a/crates/bhyve-api/sys/Cargo.toml
+++ b/crates/bhyve-api/sys/Cargo.toml
@@ -4,7 +4,9 @@ version = "0.0.0"
 license = "MPL-2.0"
 edition = "2021"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[lib]
+test = false
+doctest = false
 
 [dependencies]
 libc.workspace = true
diff --git a/crates/dladm/Cargo.toml b/crates/dladm/Cargo.toml
index 3382e7e26..7800d0732 100644
--- a/crates/dladm/Cargo.toml
+++ b/crates/dladm/Cargo.toml
@@ -4,7 +4,9 @@ version = "0.0.0"
 license = "MPL-2.0"
 edition = "2021"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[lib]
+test = false
+doctest = false
 
 [dependencies]
 libc.workspace = true
diff --git a/crates/propolis-server-config/Cargo.toml b/crates/propolis-server-config/Cargo.toml
index d7c13a352..26b4503a4 100644
--- a/crates/propolis-server-config/Cargo.toml
+++ b/crates/propolis-server-config/Cargo.toml
@@ -4,7 +4,9 @@ version = "0.0.0"
 license = "MPL-2.0"
 edition = "2021"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[lib]
+test = false
+doctest = false
 
 [dependencies]
 serde.workspace = true
diff --git a/crates/propolis-standalone-config/Cargo.toml b/crates/propolis-standalone-config/Cargo.toml
index f502db999..13036edf0 100644
--- a/crates/propolis-standalone-config/Cargo.toml
+++ b/crates/propolis-standalone-config/Cargo.toml
@@ -4,6 +4,10 @@ version = "0.0.0"
 license = "MPL-2.0"
 edition = "2021"
 
+[lib]
+test = false
+doctest = false
+
 [dependencies]
 num_enum.workspace = true
 serde.workspace = true
diff --git a/crates/propolis-types/Cargo.toml b/crates/propolis-types/Cargo.toml
index a535b715e..a963a5bb1 100644
--- a/crates/propolis-types/Cargo.toml
+++ b/crates/propolis-types/Cargo.toml
@@ -4,7 +4,9 @@ version = "0.0.0"
 license = "MPL-2.0"
 edition = "2021"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[lib]
+test = false
+doctest = false
 
 [dependencies]
 schemars = { workspace = true, features = [ "uuid1" ] }
diff --git a/crates/viona-api/Cargo.toml b/crates/viona-api/Cargo.toml
index ea0c54e61..4ada2764f 100644
--- a/crates/viona-api/Cargo.toml
+++ b/crates/viona-api/Cargo.toml
@@ -4,7 +4,8 @@ version = "0.0.0"
 license = "MPL-2.0"
 edition = "2021"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[lib]
+doctest = false
 
 [dependencies]
 libc.workspace = true
diff --git a/crates/viona-api/sys/Cargo.toml b/crates/viona-api/sys/Cargo.toml
index 48823dc91..2dfde9449 100644
--- a/crates/viona-api/sys/Cargo.toml
+++ b/crates/viona-api/sys/Cargo.toml
@@ -4,7 +4,9 @@ version = "0.0.0"
 license = "MPL-2.0"
 edition = "2021"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[lib]
+test = false
+doctest = false
 
 [dependencies]
 libc = "0.2"
diff --git a/lib/propolis-client/Cargo.toml b/lib/propolis-client/Cargo.toml
index c3207ec64..f63f542cb 100644
--- a/lib/propolis-client/Cargo.toml
+++ b/lib/propolis-client/Cargo.toml
@@ -3,7 +3,8 @@ name = "propolis-client"
 version = "0.1.0"
 edition = "2021"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[lib]
+doctest = false
 
 [dependencies]
 propolis_types.workspace = true
@@ -25,7 +26,7 @@ tokio-tungstenite = { workspace = true, optional = true }
 crucible-client-types.workspace = true
 
 [dev-dependencies]
-tokio = { workspace = true, features = ["test-util"] }
+tokio = { workspace = true, features = ["test-util", "macros"] }
 
 [features]
 default = []
diff --git a/lib/propolis/Cargo.toml b/lib/propolis/Cargo.toml
index 0b395ba82..13c5b85b2 100644
--- a/lib/propolis/Cargo.toml
+++ b/lib/propolis/Cargo.toml
@@ -4,8 +4,6 @@ version = "0.1.0"
 license = "MPL-2.0"
 edition = "2021"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
 libc.workspace = true
 bitflags.workspace = true
diff --git a/packaging/propolis-package/Cargo.toml b/packaging/propolis-package/Cargo.toml
index ca6a2cd01..3fbd4c6c2 100644
--- a/packaging/propolis-package/Cargo.toml
+++ b/packaging/propolis-package/Cargo.toml
@@ -3,6 +3,11 @@ name = "propolis-package"
 version = "0.1.0"
 edition = "2021"
 
+[[bin]]
+name = "propolis-package"
+test = false
+doctest = false
+
 [dependencies]
 anyhow.workspace = true
 indicatif.workspace = true
diff --git a/phd-tests/framework/Cargo.toml b/phd-tests/framework/Cargo.toml
index dfe6de02f..f3b92d7e6 100644
--- a/phd-tests/framework/Cargo.toml
+++ b/phd-tests/framework/Cargo.toml
@@ -4,7 +4,8 @@ version = "0.1.0"
 license = "MPL-2.0"
 edition = "2021"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[lib]
+doctest = false
 
 [dependencies]
 anyhow.workspace = true
diff --git a/phd-tests/runner/Cargo.toml b/phd-tests/runner/Cargo.toml
index 8464aa221..6a01aa412 100644
--- a/phd-tests/runner/Cargo.toml
+++ b/phd-tests/runner/Cargo.toml
@@ -4,6 +4,11 @@ version = "0.1.0"
 license = "MPL-2.0"
 edition = "2021"
 
+[[bin]]
+name = "phd-runner"
+test = false
+doctest = false
+
 [dependencies]
 anyhow.workspace = true
 backtrace.workspace = true
diff --git a/phd-tests/testcase/Cargo.toml b/phd-tests/testcase/Cargo.toml
index 5bd03d568..7c8bb8851 100644
--- a/phd-tests/testcase/Cargo.toml
+++ b/phd-tests/testcase/Cargo.toml
@@ -3,7 +3,9 @@ name = "phd-testcase"
 version = "0.1.0"
 edition = "2021"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[lib]
+test = false
+doctest = false
 
 [dependencies]
 inventory.workspace = true
diff --git a/phd-tests/testcase_macro/Cargo.toml b/phd-tests/testcase_macro/Cargo.toml
index a3f80a975..f49cefa42 100644
--- a/phd-tests/testcase_macro/Cargo.toml
+++ b/phd-tests/testcase_macro/Cargo.toml
@@ -3,12 +3,12 @@ name = "phd-testcase-macros"
 version = "0.1.0"
 edition = "2021"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[lib]
+proc_macro = true
+test = false
+doctest = false
 
 [dependencies]
 proc-macro2.workspace = true
 quote.workspace = true
 syn = { workspace = true, features = ["full"] }
-
-[lib]
-proc_macro = true
diff --git a/phd-tests/tests/Cargo.toml b/phd-tests/tests/Cargo.toml
index eba1f2b09..98f71dc8c 100644
--- a/phd-tests/tests/Cargo.toml
+++ b/phd-tests/tests/Cargo.toml
@@ -3,7 +3,9 @@ name = "phd-tests"
 version = "0.1.0"
 edition = "2021"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[lib]
+test = false
+doctest = false
 
 [dependencies]
 http.workspace = true
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
index 4eea65abf..04f8ff4e0 100644
--- a/xtask/Cargo.toml
+++ b/xtask/Cargo.toml
@@ -3,6 +3,11 @@ name = "xtask"
 version = "0.0.0"
 edition = "2021"
 
+[[bin]]
+name = "xtask"
+test = false
+doctest = false
+
 [dependencies]
 anyhow.workspace = true
 clap = { workspace = true, features = ["derive"] }