Ekdohibs
/
ocaml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Report a diff for files differing by endings only

master
David Allsopp 2020-07-25 10:36:24 +01:00
parent a651a82488
commit 6a4f9aef5f
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ocamltest/filecompare.ml
View File

@ -231,13 +231,15 @@ let diff files =
let temporary_file = Filename.temp_file "ocamltest" "diff" in
let diff_commandline =
Filename.quote_command "diff" ~stdout:temporary_file
[ "-u";
[ "--strip-trailing-cr"; "-u";
files.reference_filename;
files.output_filename ]
in
let result =
if (Sys.command diff_commandline) = 2 then Stdlib.Error "diff"
else Ok (Sys.string_of_file temporary_file)
match Sys.command diff_commandline with
| 0 -> Ok "Inconsistent LF/CRLF line-endings"
| 2 -> Stdlib.Error "diff"
| _ -> Ok (Sys.string_of_file temporary_file)
in
Sys.force_remove temporary_file;
result