From 9ba3f249ec07d5fdf9734478fff2ce1d9d68b315 Mon Sep 17 00:00:00 2001
From: Rain <rain@oxide.computer>
Date: Mon, 20 Nov 2023 19:29:00 -0800
Subject: [PATCH] =?UTF-8?q?[=F0=9D=98=80=F0=9D=97=BD=F0=9D=97=BF]=20initia?=
 =?UTF-8?q?l=20version?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Created using spr 1.3.5
---
 .config/nextest.toml |  4 +++-
 Cargo.toml           | 15 +++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/.config/nextest.toml b/.config/nextest.toml
index 79774e3658..ef296d7ef8 100644
--- a/.config/nextest.toml
+++ b/.config/nextest.toml
@@ -17,7 +17,9 @@ setup = 'crdb-seed'
 fail-fast = false
 
 [script.crdb-seed]
-command = 'cargo run -p crdb-seed'
+# Use the test profile for this executable since that's how almost all
+# invocations of nextest happen.
+command = 'cargo run -p crdb-seed --profile test'
 
 # The ClickHouse cluster tests currently rely on a hard-coded set of ports for
 # the nodes in the cluster. We would like to relax this in the future, at which
diff --git a/Cargo.toml b/Cargo.toml
index b18b20aec7..9d7a0c8156 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -91,7 +91,9 @@ default-members = [
     "dev-tools/omdb",
     "dev-tools/omicron-dev",
     "dev-tools/thing-flinger",
-    "dev-tools/xtask",
+    # Do not include xtask in the list of default members, because this causes
+    # hakari to not work as well and build times to be longer.
+    # See omicron#4392.
     "dns-server",
     "gateway-cli",
     "gateway-test-utils",
@@ -392,12 +394,21 @@ zip = { version = "0.6.6", default-features = false, features = ["deflate","bzip
 zone = { version = "0.3", default-features = false, features = ["async"] }
 
 [profile.dev]
-panic = "abort"
+# Note: This used to be panic = "abort" earlier, but that caused a lot of
+# duplicate dependency builds. Letting panic be "unwind" causes dependencies
+# across `cargo test` and `cargo run` to be unified. See omicron#4392.
+panic = "unwind"
+
 # See https://github.com/oxidecomputer/omicron/issues/4009 for some background context here.
 # By reducing the debug level (though keeping enough to have meaningful
 # backtraces), we reduce incremental build time and binary size significantly.
 debug = "line-tables-only"
 
+[profile.dev.build-override]
+# Setting this to line-tables-only results in a large improvement in build
+# times, because it allows target and host dependencies to be unified.
+debug = "line-tables-only"
+
 # `bindgen` is used by `samael`'s build script; building it with optimizations
 # makes that build script run ~5x faster, more than offsetting the additional
 # build time added to `bindgen` itself.