Support ui_test

This also moves trybuild test to tests/test.rs.

Author: taiki-e

.github/.cspell/project-dictionary.txt

@@ -1,7 +1,6 @@
 autocfg
 bindeps
 binstall
-compiletest
 demangler
 doctestbins
 easytime
@@ -24,7 +23,6 @@ rmeta
 rustfilt
 rustix
 TESTNAME
-trybuild
 winapi
 xargo
 Xdemangler

.github/.cspell/rust-dependencies.txt

@@ -1,7 +1,11 @@
 version: 2
 updates:
   - package-ecosystem: cargo
-    directory: /
+    directories:
+      - /
+      # crates with [workspace] table are not recognized by the above 'directory: /'
+      - /tests/fixtures/crates/trybuild
+      - /tests/fixtures/crates/ui_test
     schedule:
       interval: daily
     commit-message:

.github/dependabot.yml

@@ -127,7 +127,7 @@ jobs:
           cargo llvm-cov nextest --text --fail-under-lines 100 --profile ci --cargo-profile dev
           cargo clean
         working-directory: tests/fixtures/crates/bin_crate
-      - name: Test nightly-specific options, old Cargo compatibility, trybuild compatibility
+      - name: Test nightly-specific options, old Cargo compatibility
         run: |
           retry() {
             for i in {1..10}; do
@@ -140,11 +140,6 @@ jobs:
             "$@"
           }
           unset RUSTFLAGS
-          if { sed --help 2>&1 || true; } | grep -Eq -e '-i extension'; then
-            in_place=(-i '')
-          else
-            in_place=(-i)
-          fi
           target="${{ matrix.target }}"
           if [[ -z "${target}" ]]; then
             target=$(rustc -vV | grep -E '^host:' | cut -d' ' -f2)
@@ -177,25 +172,6 @@ jobs:
               popd >/dev/null
               ;;
           esac
-
-          # Test trybuild compatibility.
-          case "${{ matrix.target }}" in
-            aarch64-pc-windows-gnullvm) ;; # coverage is not supported yet on host (aarch64-pc-windows-msvc).
-            *)
-              retry git clone --depth 1 https://github.com/taiki-e/easy-ext.git
-              pushd -- easy-ext >/dev/null
-              cargo llvm-cov --test compiletest --fail-under-lines 70
-              cargo clean
-              cargo llvm-cov --test compiletest --fail-under-lines 70 --target "${target}"
-              cargo clean
-              sed -E "${in_place[@]}" 's/trybuild = .*/trybuild = "1"/g' Cargo.toml # easy-ext uses patched trybuild
-              cargo llvm-cov --test compiletest --fail-under-lines 70
-              cargo clean
-              cargo llvm-cov --test compiletest --fail-under-lines 70 --target "${target}"
-              cargo clean
-              popd >/dev/null
-            ;;
-          esac
         if: startsWith(matrix.rust, 'nightly')
       - name: Test --dep-coverage
         run: |

.github/workflows/ci.yml

@@ -12,6 +12,8 @@ Note: In this file, do not use the hard wrap in the middle of a sentence for com
 
 ## [Unreleased]
 
+- Support [`ui_test`](https://github.com/oli-obk/ui_test). ([#477](https://github.com/taiki-e/cargo-llvm-cov/pull/477))
+
 ## [0.8.1] - 2026-01-26
 
 - Back "cargo-llvm-cov subcommands other than report and clean may not work correctly ..." error to warning.

CHANGELOG.md

@@ -43,6 +43,7 @@ termcolor = "1"
 walkdir = "2.2.3"
 
 [dev-dependencies]
+build-context = "0.1"
 rustversion = "1"
 tempfile = { version = "3", default-features = false }
 test-helper = { features = ["cli", "doc", "git"], git = "https://github.com/taiki-e/test-helper.git", rev = "f38a7f5" }

Cargo.toml

@@ -10,7 +10,7 @@ This is a wrapper around rustc [`-C instrument-coverage`][instrument-coverage] a
 
 - Generate very precise coverage data. (line, region, and branch coverage. branch coverage is currently optional and requires nightly, see [#8] for more)
 - Support `cargo test`, `cargo run`, and [`cargo nextest`][nextest] with command-line interface compatible with cargo.
-- Support for proc-macro, including coverage of UI tests.
+- Support for proc-macro, including coverage of UI tests ([trybuild](https://github.com/dtolnay/trybuild), [ui_test](https://github.com/oli-obk/ui_test)).
 - Support for doc tests. (this is currently optional and requires nightly, see [#2] for more)
 - Fast because it does not introduce extra layers between rustc, cargo, and llvm-tools.
 

README.md

@@ -192,6 +192,11 @@ impl Workspace {
         }
         trybuild_target_dir
     }
+
+    pub(crate) fn ui_test_target_dir(&self) -> Utf8PathBuf {
+        // https://github.com/oli-obk/ui_test/blob/0.30.4/src/config.rs#L180
+        self.metadata.target_directory.join("ui")
+    }
 }
 
 // https://doc.rust-lang.org/nightly/cargo/commands/cargo-locate-project.html

src/cargo.rs

@@ -149,6 +149,7 @@ fn clean_ws_inner(
     rm_rf(&ws.profdata_file, verbose)?;
 
     clean_trybuild_artifacts(ws, pkg_ids, verbose)?;
+    clean_ui_test_artifacts(ws, verbose)?;
     Ok(())
 }
 
@@ -186,6 +187,12 @@ fn clean_trybuild_artifacts(ws: &Workspace, pkg_ids: &[PackageId], verbose: bool
     Ok(())
 }
 
+fn clean_ui_test_artifacts(ws: &Workspace, verbose: bool) -> Result<()> {
+    let ui_test_target_dir = ws.ui_test_target_dir();
+    rm_rf(ui_test_target_dir, verbose)?;
+    Ok(())
+}
+
 fn rm_rf(path: impl AsRef<Path>, verbose: bool) -> Result<()> {
     let path = path.as_ref();
     // Using std::fs instead of fs-err is okay here since we ignore error contents

src/clean.rs

@@ -1006,6 +1006,23 @@ fn object_files(cx: &Context) -> Result<Vec<OsString>> {
     }
     collect_trybuild_target_dir(trybuild_target_dir)?;
 
+    // ui_test
+    let ui_test_target_dir = cx.ws.ui_test_target_dir();
+    let mut collect_ui_test_target_dir = |ui_test_target_dir: Utf8PathBuf| -> Result<()> {
+        if ui_test_target_dir.is_dir() {
+            for entry in walk_target_dir(cx, &ui_test_target_dir) {
+                let path = make_relative(cx, entry.path());
+                if is_object(cx, path) {
+                    files.push(path.to_owned().into_os_string());
+                }
+            }
+            searched_dir.push(',');
+            searched_dir.push_str(ui_test_target_dir.as_str());
+        }
+        Ok(())
+    };
+    collect_ui_test_target_dir(ui_test_target_dir)?;
+
     // This sort is necessary to make the result of `llvm-cov show` match between macOS and Linux.
     files.sort_unstable();