diff options
| author | Asit Dhal <dhal.asitk@gmail.com> | 2020-06-09 05:28:58 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-06-10 11:23:10 (GMT) |
| commit | a7d44d55aea622dccd80164ed9f616ee77d5aba7 (patch) | |
| tree | 6c88afcf1485ac9281d7b0dc3dd5e5a0d9c8ff58 | |
| parent | c08ee5e74e4ee19989a99a405936a1cb61d33534 (diff) | |
| download | CMake-a7d44d55aea622dccd80164ed9f616ee77d5aba7.zip CMake-a7d44d55aea622dccd80164ed9f616ee77d5aba7.tar.gz CMake-a7d44d55aea622dccd80164ed9f616ee77d5aba7.tar.bz2 | |
cmake: remove -E compare_files error message if files differ
It is not an error for the files to be different.
Fixes: #20803
| -rw-r--r-- | Source/cmcmd.cxx | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/CommandLine/E_compare_files-different-eol-stderr.txt | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/CommandLine/E_compare_files-ignore-eol-nonexistent-stderr.txt | 1 |
3 files changed, 0 insertions, 4 deletions
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx index de76d73..cbc8e8f 100644 --- a/Source/cmcmd.cxx +++ b/Source/cmcmd.cxx @@ -586,8 +586,6 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string> const& args) } if (filesDiffer) { - std::cerr << "Files \"" << args[args.size() - 2] << "\" to \"" - << args[args.size() - 1] << "\" are different.\n"; return 1; } return 0; diff --git a/Tests/RunCMake/CommandLine/E_compare_files-different-eol-stderr.txt b/Tests/RunCMake/CommandLine/E_compare_files-different-eol-stderr.txt deleted file mode 100644 index 4729ccb..0000000 --- a/Tests/RunCMake/CommandLine/E_compare_files-different-eol-stderr.txt +++ /dev/null @@ -1 +0,0 @@ -^Files ".*/compare_files/lf" to ".*/compare_files/crlf" are different.$ diff --git a/Tests/RunCMake/CommandLine/E_compare_files-ignore-eol-nonexistent-stderr.txt b/Tests/RunCMake/CommandLine/E_compare_files-ignore-eol-nonexistent-stderr.txt deleted file mode 100644 index 8a9ca81..0000000 --- a/Tests/RunCMake/CommandLine/E_compare_files-ignore-eol-nonexistent-stderr.txt +++ /dev/null @@ -1 +0,0 @@ -^Files "nonexistent_a" to "nonexistent_b" are different.$ |