Support for trybuild and similar macro testing tools (#168)

Signed-off-by: Filippo Costa <filippo@neysofu.me>
Swatinem · Sep 12, 2023 · 67c46e7 · 67c46e7
1 parent 44b6087
commit 67c46e7
Show file tree

Hide file tree

Showing 9 changed files with 138 additions and 2 deletions.
diff --git a/dist/restore/index.js b/dist/restore/index.js
@@ -64354,6 +64354,25 @@ async function cleanTargetDir(targetDir, packages, checkTimestamp = false) {
 }
 async function cleanProfileTarget(profileDir, packages, checkTimestamp = false) {
     lib_core.debug(`cleaning profile directory "${profileDir}"`);
+    // Quite a few testing utility crates store compilation artifacts as nested
+    // workspaces under `target/tests`. Notably, `target/tests/target` and
+    // `target/tests/trybuild`.
+    if (external_path_default().basename(profileDir) === "tests") {
+        try {
+            // https://github.com/vertexclique/kaos/blob/9876f6c890339741cc5be4b7cb9df72baa5a6d79/src/cargo.rs#L25
+            // https://github.com/eupn/macrotest/blob/c4151a5f9f545942f4971980b5d264ebcd0b1d11/src/cargo.rs#L27
+            cleanTargetDir(external_path_default().join(profileDir, "target"), packages, checkTimestamp);
+        }
+        catch { }
+        try {
+            // https://github.com/dtolnay/trybuild/blob/eec8ca6cb9b8f53d0caf1aa499d99df52cae8b40/src/cargo.rs#L50
+            cleanTargetDir(external_path_default().join(profileDir, "trybuild"), packages, checkTimestamp);
+        }
+        catch { }
+        // Delete everything else.
+        await rmExcept(profileDir, new Set(["target", "trybuild"]), checkTimestamp);
+        return;
+    }
     let keepProfile = new Set(["build", ".fingerprint", "deps"]);
     await rmExcept(profileDir, keepProfile);
     const keepPkg = new Set(packages.map((p) => p.name));

diff --git a/dist/save/index.js b/dist/save/index.js
@@ -64354,6 +64354,25 @@ async function cleanTargetDir(targetDir, packages, checkTimestamp = false) {
 }
 async function cleanProfileTarget(profileDir, packages, checkTimestamp = false) {
     core.debug(`cleaning profile directory "${profileDir}"`);
+    // Quite a few testing utility crates store compilation artifacts as nested
+    // workspaces under `target/tests`. Notably, `target/tests/target` and
+    // `target/tests/trybuild`.
+    if (external_path_default().basename(profileDir) === "tests") {
+        try {
+            // https://github.com/vertexclique/kaos/blob/9876f6c890339741cc5be4b7cb9df72baa5a6d79/src/cargo.rs#L25
+            // https://github.com/eupn/macrotest/blob/c4151a5f9f545942f4971980b5d264ebcd0b1d11/src/cargo.rs#L27
+            cleanTargetDir(external_path_default().join(profileDir, "target"), packages, checkTimestamp);
+        }
+        catch { }
+        try {
+            // https://github.com/dtolnay/trybuild/blob/eec8ca6cb9b8f53d0caf1aa499d99df52cae8b40/src/cargo.rs#L50
+            cleanTargetDir(external_path_default().join(profileDir, "trybuild"), packages, checkTimestamp);
+        }
+        catch { }
+        // Delete everything else.
+        await rmExcept(profileDir, new Set(["target", "trybuild"]), checkTimestamp);
+        return;
+    }
     let keepProfile = new Set(["build", ".fingerprint", "deps"]);
     await rmExcept(profileDir, keepProfile);
     const keepPkg = new Set(packages.map((p) => p.name));

diff --git a/src/cleanup.ts b/src/cleanup.ts
@@ -34,6 +34,26 @@ export async function cleanTargetDir(targetDir: string, packages: Packages, chec
 async function cleanProfileTarget(profileDir: string, packages: Packages, checkTimestamp = false) {
   core.debug(`cleaning profile directory "${profileDir}"`);
 
+  // Quite a few testing utility crates store compilation artifacts as nested
+  // workspaces under `target/tests`. Notably, `target/tests/target` and
+  // `target/tests/trybuild`.
+  if (path.basename(profileDir) === "tests") {
+    try {
+      // https://github.com/vertexclique/kaos/blob/9876f6c890339741cc5be4b7cb9df72baa5a6d79/src/cargo.rs#L25
+      // https://github.com/eupn/macrotest/blob/c4151a5f9f545942f4971980b5d264ebcd0b1d11/src/cargo.rs#L27
+      cleanTargetDir(path.join(profileDir, "target"), packages, checkTimestamp);
+    } catch { }
+    try {
+      // https://github.com/dtolnay/trybuild/blob/eec8ca6cb9b8f53d0caf1aa499d99df52cae8b40/src/cargo.rs#L50
+      cleanTargetDir(path.join(profileDir, "trybuild"), packages, checkTimestamp);
+    } catch { }
+
+    // Delete everything else.
+    await rmExcept(profileDir, new Set(["target", "trybuild"]), checkTimestamp);
+
+    return
+  }
+
   let keepProfile = new Set(["build", ".fingerprint", "deps"]);
   await rmExcept(profileDir, keepProfile);
 

diff --git a/tests/Cargo.lock b/tests/Cargo.lock
diff --git a/tests/Cargo.toml b/tests/Cargo.toml
@@ -9,5 +9,8 @@ edition = "2021"
 reqwest = "0.11.18"
 watto = { git = "https://github.com/getsentry/watto", rev = "d71c8218506bddba102a124a460d64da25e303dc", features = ["strings"] }
 
+[dev-dependencies]
+trybuild = "1"
+
 [target.'cfg(not(target_env = "msvc"))'.dependencies]
 tikv-jemallocator = "0.5.4"
diff --git a/tests/tests/trybuild.rs b/tests/tests/trybuild.rs
@@ -0,0 +1,6 @@
+#[test]
+fn test_trybuild() {
+    let t = trybuild::TestCases::new();
+    t.pass("tests/trybuild/empty_main.rs");
+    t.compile_fail("tests/trybuild/fail_to_compile.rs");
+}
diff --git a/tests/tests/trybuild/empty_main.rs b/tests/tests/trybuild/empty_main.rs
@@ -0,0 +1 @@
+fn main() {}
diff --git a/tests/tests/trybuild/fail_to_compile.rs b/tests/tests/trybuild/fail_to_compile.rs
@@ -0,0 +1,3 @@
+fn main() {
+    "foobar".foobar();
+}
diff --git a/tests/tests/trybuild/fail_to_compile.stderr b/tests/tests/trybuild/fail_to_compile.stderr
@@ -0,0 +1,5 @@
+error[E0599]: no method named `foobar` found for reference `&'static str` in the current scope
+ --> tests/trybuild/fail_to_compile.rs:2:14
+  |
+2 |     "foobar".foobar();
+  |              ^^^^^^ method not found in `&str`