From a7d44d55aea622dccd80164ed9f616ee77d5aba7 Mon Sep 17 00:00:00 2001 From: Asit Dhal Date: Tue, 9 Jun 2020 07:28:58 +0200 Subject: cmake: remove -E compare_files error message if files differ It is not an error for the files to be different. Fixes: #20803 --- Source/cmcmd.cxx | 2 -- Tests/RunCMake/CommandLine/E_compare_files-different-eol-stderr.txt | 1 - .../CommandLine/E_compare_files-ignore-eol-nonexistent-stderr.txt | 1 - 3 files changed, 4 deletions(-) delete mode 100644 Tests/RunCMake/CommandLine/E_compare_files-different-eol-stderr.txt delete mode 100644 Tests/RunCMake/CommandLine/E_compare_files-ignore-eol-nonexistent-stderr.txt 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 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.$ -- cgit v0.12