Skip to content

Show git diff command on checkfile failure #19308

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 20, 2023
Merged

Show git diff command on checkfile failure #19308

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions compiler/test/dotty/tools/vulpix/FileDiff.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,13 @@ import java.nio.charset.StandardCharsets


object FileDiff {
def diffCommand(expectFile: String, actualFile: String): String =
s"git diff --no-index -- $expectFile $actualFile"

def diffMessage(expectFile: String, actualFile: String): String =
s"""Test output dumped in: $actualFile
| See diff of the checkfile (`brew install icdiff` for colored diff)
| > diff $expectFile $actualFile
| See diff of the checkfile (`--color=always` for colored diff)
| > ${FileDiff.diffCommand(expectFile, actualFile)}
| Replace checkfile with current output
| > mv $actualFile $expectFile
""".stripMargin
Expand Down