update tests relying on dev and build-deps reuse

Author: lqd

tests/testsuite/build_script.rs

@@ -4379,6 +4379,10 @@ fn optional_build_script_dep() {
 
 #[cargo_test]
 fn optional_build_dep_and_required_normal_dep() {
+    // Note: `dev` and `dev.build-override` have different defaults. `bar` would
+    // be built twice in the general case: once without debuginfo and once with
+    // debuginfo = 2. Setting `debug = 2` in `dev.build-override` ensures it's
+    // only built once in this test.
     let p = project()
         .file(
             "Cargo.toml",
@@ -4393,6 +4397,9 @@ fn optional_build_dep_and_required_normal_dep() {
 
             [build-dependencies]
             bar = { path = "./bar" }
+
+            [profile.dev.build-override]
+            debug = 2 # see note above
             "#,
         )
         .file("build.rs", "extern crate bar; fn main() { bar::bar(); }")

tests/testsuite/dep_info.rs

@@ -238,6 +238,11 @@ fn relative_depinfo_paths_ws() {
 
     // Test relative dep-info paths in a workspace with --target with
     // proc-macros and other dependency kinds.
+    //
+    // Note: `dev` and `dev.build-override` have different defaults. `pmdep`
+    // would be built twice in the general case: once without debuginfo and once
+    // with debuginfo = 2. Setting `debug = 2` in `dev.build-override` ensures
+    // it will only create a single dep-info file.
     Package::new("regdep", "0.1.0")
         .file("src/lib.rs", "pub fn f() {}")
         .publish();
@@ -255,6 +260,9 @@ fn relative_depinfo_paths_ws() {
             r#"
             [workspace]
             members = ["foo"]
+
+            [profile.dev.build-override]
+            debug = 2 # see note above
             "#,
         )
         /*********** Main Project ***********/

tests/testsuite/features2.rs

@@ -1050,13 +1050,21 @@ fn decouple_proc_macro() {
 #[cargo_test]
 fn proc_macro_ws() {
     // Checks for bug with proc-macro in a workspace with dependency (shouldn't panic).
+    //
+    // Note, `dev` and `dev.build-override` have different defaults. `pm` would
+    // be built twice in the general case: once without debuginfo and once with
+    // debuginfo = 2. Setting `debug = 2` in `dev.build-override` ensures it's
+    // only built once and `foo` remains fresh during the second check build.
     let p = project()
         .file(
             "Cargo.toml",
             r#"
             [workspace]
             members = ["foo", "pm"]
             resolver = "2"
+
+            [profile.dev.build-override]
+            debug = 2 # see note above
             "#,
         )
         .file(
@@ -2161,13 +2169,21 @@ fn pm_with_int_shared() {
     // with `--workspace`, see https://github.com/rust-lang/cargo/issues/8312.
     //
     // This uses a const-eval hack to do compile-time feature checking.
+    //
+    // Note, `dev` and `dev.build-override` have different defaults. `pm` would
+    // be built twice in the general case: once without debuginfo and once with
+    // debuginfo = 2. Setting `debug = 2` in `dev.build-override` ensures it's
+    // only built once in this test.
     let p = project()
         .file(
             "Cargo.toml",
             r#"
                 [workspace]
                 members = ["foo", "pm", "shared"]
                 resolver = "2"
+
+                [profile.dev.build-override]
+                debug = 2 # see note above
             "#,
         )
         .file(

tests/testsuite/freshness.rs

@@ -1344,6 +1344,10 @@ fn fingerprint_cleaner_does_not_rebuild() {
 
 #[cargo_test]
 fn reuse_panic_build_dep_test() {
+    // Note: `dev` and `dev.build-override` have different defaults. `bar` would
+    // be built twice in the general case: once without debuginfo and once with
+    // debuginfo = 2. Setting `debug = 2` in `dev.build-override` ensures it's
+    // only built once in this test.
     let p = project()
         .file(
             "Cargo.toml",
@@ -1360,6 +1364,9 @@ fn reuse_panic_build_dep_test() {
 
                 [profile.dev]
                 panic = "abort"
+
+                [profile.dev.build-override]
+                debug = 2 # see note above
             "#,
         )
         .file("src/lib.rs", "")

tests/testsuite/proc_macro.rs

@@ -498,13 +498,20 @@ fn proc_macro_extern_prelude() {
 
 #[cargo_test]
 fn proc_macro_built_once() {
+    // Note: `dev` and `dev.build-override` have different defaults. `the-macro`
+    // would be built twice in the general case: once without debuginfo and once
+    // with debuginfo = 2. Setting `debug = 2` in `dev.build-override` ensures
+    // it's only built once in this test.
     let p = project()
         .file(
             "Cargo.toml",
             r#"
                 [workspace]
                 members = ['a', 'b']
                 resolver = "2"
+
+                [profile.dev.build-override]
+                debug = 2 # see note above
             "#,
         )
         .file(

tests/testsuite/profile_overrides.rs

@@ -135,6 +135,9 @@ fn profile_override_bad_settings() {
 #[cargo_test]
 fn profile_override_hierarchy() {
     // Test that the precedence rules are correct for different types.
+    // Note, `dev` and `dev.build-override` have different defaults. `dep` would be built twice in
+    // the general case: once without debuginfo and once with debuginfo = 2. Setting `debug = 2` in
+    // `dev.build-override` ensures it's only built once in this test.
     let p = project()
         .file(
             "Cargo.toml",
@@ -153,6 +156,7 @@ fn profile_override_hierarchy() {
 
             [profile.dev.build-override]
             codegen-units = 4
+            debug = 2 # see note above
             "#,
         )
         // m1