glenux-archive/spf13--cobra
1
0
Fork 0
mirror of https://github.com/spf13/cobra synced 2024-11-24 14:47:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix(diff): use arg '--strip-trailing-cr' (#949)

Browse source 
In tests with diff, ignores trailing carriage returns (so tests pass on windows)
This commit is contained in:
Unai Martinez-Corral 2021-11-16 22:17:12 +00:00 committed by GitHub
parent 442031e4ff
commit 62a72cdd0f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cobra/cmd/golden_test.go
View file

@ -43,7 +43,7 @@ func compareFiles(pathA, pathB string) error {
// Don't execute diff if it can't be found. // Don't execute diff if it can't be found.
return nil return nil
} }
diffCmd := exec.Command(diffPath, "-u", pathA, pathB) diffCmd := exec.Command(diffPath, "-u", "--strip-trailing-cr", pathA, pathB)
diffCmd.Stdout = output diffCmd.Stdout = output
diffCmd.Stderr = output diffCmd.Stderr = output