[Cmake-commits] CMake branch, master, updated. v3.12.1-525-ge48a278
Kitware Robot
kwrobot at kitware.com
Fri Aug 31 14:45:06 EDT 2018
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via e48a278cdcafbd40cf01533096859f646a87505b (commit)
via 2ba1c7fc9e8a4bfc938399ba7959b3d392b34053 (commit)
via e58a13c54669142be5290493827ade4f8959418a (commit)
via fde61d3ad3c343a82688031662f7e423a5631171 (commit)
via ce3cd1a89b951949a221700c972a9932a31876aa (commit)
via 5aaaee5e9e67b637c3e34346715377145bc08a97 (commit)
from 16225c28d09c9ec220ed481dc2a4567bcdc02639 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e48a278cdcafbd40cf01533096859f646a87505b
commit e48a278cdcafbd40cf01533096859f646a87505b
Merge: 2ba1c7f 5aaaee5
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 31 18:44:26 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Aug 31 14:44:32 2018 -0400
Merge topic 'no-sanitizer-logfile'
5aaaee5e9e ctest_memcheck: Change failure to find log file from error to warning
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2323
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2ba1c7fc9e8a4bfc938399ba7959b3d392b34053
commit 2ba1c7fc9e8a4bfc938399ba7959b3d392b34053
Merge: e58a13c fde61d3
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 31 18:42:42 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Aug 31 14:42:50 2018 -0400
Merge topic 'ctest-WARNING-not-error'
fde61d3ad3 CTest: Add error exception for sphinx-build WARNING messages
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2325
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e58a13c54669142be5290493827ade4f8959418a
commit e58a13c54669142be5290493827ade4f8959418a
Merge: 16225c2 ce3cd1a
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 31 18:41:19 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Aug 31 14:41:28 2018 -0400
Merge topic 'solaris-silence-system-libform-warning'
ce3cd1a89b Solaris: Silence warning when using system libform.
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2330
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fde61d3ad3c343a82688031662f7e423a5631171
commit fde61d3ad3c343a82688031662f7e423a5631171
Author: Tim <tdhutt at gmail.com>
AuthorDate: Wed Aug 29 04:57:00 2018 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Aug 30 10:02:38 2018 -0400
CTest: Add error exception for sphinx-build WARNING messages
Sphinx-build warnings look like this:
../path/to/file.rst:105: WARNING: This is not an error.
CTest detects these as errors by this regex:
([^ :]+):([0-9]+): ([^ \\t])
Add an exception as we already have for lower-case `: warning`.
diff --git a/Source/CTest/cmCTestBuildHandler.cxx b/Source/CTest/cmCTestBuildHandler.cxx
index 3f6654b..c5941ce 100644
--- a/Source/CTest/cmCTestBuildHandler.cxx
+++ b/Source/CTest/cmCTestBuildHandler.cxx
@@ -83,6 +83,7 @@ static const char* cmCTestErrorExceptions[] = {
"instantiated from ",
"candidates are:",
": warning",
+ ": WARNING",
": \\(Warning\\)",
": note",
"Note:",
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ce3cd1a89b951949a221700c972a9932a31876aa
commit ce3cd1a89b951949a221700c972a9932a31876aa
Author: Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Wed Aug 29 16:11:02 2018 -0400
Commit: Chuck Atkins <chuck.atkins at kitware.com>
CommitDate: Wed Aug 29 16:11:02 2018 -0400
Solaris: Silence warning when using system libform.
diff --git a/CTestCustom.cmake.in b/CTestCustom.cmake.in
index aef375a..18e0078 100644
--- a/CTestCustom.cmake.in
+++ b/CTestCustom.cmake.in
@@ -2,6 +2,7 @@ list(APPEND CTEST_CUSTOM_ERROR_MATCH
"ERROR:")
list(APPEND CTEST_CUSTOM_WARNING_EXCEPTION
+ "warning: cast from 'char\\*' to 'cmCursesWidget\\*' increases required alignment of target type" # Occurs when using Solaris's system libform
"xtree.[0-9]+. : warning C4702: unreachable code"
"warning LNK4221"
"warning LNK4204" # Occurs by race condition with objects in small libs
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5aaaee5e9e67b637c3e34346715377145bc08a97
commit 5aaaee5e9e67b637c3e34346715377145bc08a97
Author: Betsy McPhail <betsy.mcphail at kitware.com>
AuthorDate: Tue Aug 28 16:45:49 2018 -0400
Commit: Betsy McPhail <betsy.mcphail at kitware.com>
CommitDate: Tue Aug 28 16:45:49 2018 -0400
ctest_memcheck: Change failure to find log file from error to warning
Sanitizers do not create a log file when no defects are found. Therefore,
it is currently impossible for ctest_memcheck to set both
`CAPTURE_CMAKE_ERROR` and `RETURN_VALUE` to zero.
With defects, `CAPTURE_CMAKE_ERROR`=0 and `RETURN_VALUE`=-1, as expected.
With no defects, `CAPTURE_CMAKE_ERROR`=-1 and `RETURN_VALUE`=0.
diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx
index 04d1839..9c9532a 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -1087,7 +1087,7 @@ void cmCTestMemCheckHandler::TestOutputFileNames(
g.FindFiles(ofile);
if (g.GetFiles().empty()) {
std::string log = "Cannot find memory tester output file: " + ofile;
- cmCTestLog(this->CTest, ERROR_MESSAGE, log << std::endl);
+ cmCTestLog(this->CTest, WARNING, log << std::endl);
ofile.clear();
} else {
files = g.GetFiles();
@@ -1095,7 +1095,7 @@ void cmCTestMemCheckHandler::TestOutputFileNames(
}
} else if (!cmSystemTools::FileExists(ofile)) {
std::string log = "Cannot find memory tester output file: " + ofile;
- cmCTestLog(this->CTest, ERROR_MESSAGE, log << std::endl);
+ cmCTestLog(this->CTest, WARNING, log << std::endl);
ofile.clear();
}
files.push_back(std::move(ofile));
diff --git a/Tests/RunCMake/ctest_memcheck/DummyAddressLeakSanitizer-result.txt b/Tests/RunCMake/ctest_memcheck/DummyAddressLeakSanitizer-result.txt
deleted file mode 100644
index b57e2de..0000000
--- a/Tests/RunCMake/ctest_memcheck/DummyAddressLeakSanitizer-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-(-1|255)
diff --git a/Tests/RunCMake/ctest_memcheck/DummyAddressSanitizer-result.txt b/Tests/RunCMake/ctest_memcheck/DummyAddressSanitizer-result.txt
deleted file mode 100644
index b57e2de..0000000
--- a/Tests/RunCMake/ctest_memcheck/DummyAddressSanitizer-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-(-1|255)
diff --git a/Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer-result.txt b/Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer-result.txt
deleted file mode 100644
index b57e2de..0000000
--- a/Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-(-1|255)
diff --git a/Tests/RunCMake/ctest_memcheck/DummyLeakSanitizerPrintDefects-result.txt b/Tests/RunCMake/ctest_memcheck/DummyLeakSanitizerPrintDefects-result.txt
deleted file mode 100644
index b57e2de..0000000
--- a/Tests/RunCMake/ctest_memcheck/DummyLeakSanitizerPrintDefects-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-(-1|255)
diff --git a/Tests/RunCMake/ctest_memcheck/DummyMemorySanitizer-result.txt b/Tests/RunCMake/ctest_memcheck/DummyMemorySanitizer-result.txt
deleted file mode 100644
index b57e2de..0000000
--- a/Tests/RunCMake/ctest_memcheck/DummyMemorySanitizer-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-(-1|255)
diff --git a/Tests/RunCMake/ctest_memcheck/DummyPurifyNoLogFile-result.txt b/Tests/RunCMake/ctest_memcheck/DummyPurifyNoLogFile-result.txt
deleted file mode 100644
index b57e2de..0000000
--- a/Tests/RunCMake/ctest_memcheck/DummyPurifyNoLogFile-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-(-1|255)
diff --git a/Tests/RunCMake/ctest_memcheck/DummyThreadSanitizer-result.txt b/Tests/RunCMake/ctest_memcheck/DummyThreadSanitizer-result.txt
deleted file mode 100644
index b57e2de..0000000
--- a/Tests/RunCMake/ctest_memcheck/DummyThreadSanitizer-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-(-1|255)
diff --git a/Tests/RunCMake/ctest_memcheck/DummyUndefinedBehaviorSanitizer-result.txt b/Tests/RunCMake/ctest_memcheck/DummyUndefinedBehaviorSanitizer-result.txt
deleted file mode 100644
index b57e2de..0000000
--- a/Tests/RunCMake/ctest_memcheck/DummyUndefinedBehaviorSanitizer-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-(-1|255)
diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions-result.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions-result.txt
deleted file mode 100644
index b57e2de..0000000
--- a/Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-(-1|255)
diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindNoLogFile-result.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindNoLogFile-result.txt
deleted file mode 100644
index b57e2de..0000000
--- a/Tests/RunCMake/ctest_memcheck/DummyValgrindNoLogFile-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-(-1|255)
-----------------------------------------------------------------------
Summary of changes:
CTestCustom.cmake.in | 1 +
Source/CTest/cmCTestBuildHandler.cxx | 1 +
Source/CTest/cmCTestMemCheckHandler.cxx | 4 ++--
Tests/RunCMake/ctest_memcheck/DummyAddressLeakSanitizer-result.txt | 1 -
Tests/RunCMake/ctest_memcheck/DummyAddressSanitizer-result.txt | 1 -
Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer-result.txt | 1 -
.../RunCMake/ctest_memcheck/DummyLeakSanitizerPrintDefects-result.txt | 1 -
Tests/RunCMake/ctest_memcheck/DummyMemorySanitizer-result.txt | 1 -
Tests/RunCMake/ctest_memcheck/DummyPurifyNoLogFile-result.txt | 1 -
Tests/RunCMake/ctest_memcheck/DummyThreadSanitizer-result.txt | 1 -
.../ctest_memcheck/DummyUndefinedBehaviorSanitizer-result.txt | 1 -
Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions-result.txt | 1 -
Tests/RunCMake/ctest_memcheck/DummyValgrindNoLogFile-result.txt | 1 -
13 files changed, 4 insertions(+), 12 deletions(-)
delete mode 100644 Tests/RunCMake/ctest_memcheck/DummyAddressLeakSanitizer-result.txt
delete mode 100644 Tests/RunCMake/ctest_memcheck/DummyAddressSanitizer-result.txt
delete mode 100644 Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer-result.txt
delete mode 100644 Tests/RunCMake/ctest_memcheck/DummyLeakSanitizerPrintDefects-result.txt
delete mode 100644 Tests/RunCMake/ctest_memcheck/DummyMemorySanitizer-result.txt
delete mode 100644 Tests/RunCMake/ctest_memcheck/DummyPurifyNoLogFile-result.txt
delete mode 100644 Tests/RunCMake/ctest_memcheck/DummyThreadSanitizer-result.txt
delete mode 100644 Tests/RunCMake/ctest_memcheck/DummyUndefinedBehaviorSanitizer-result.txt
delete mode 100644 Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions-result.txt
delete mode 100644 Tests/RunCMake/ctest_memcheck/DummyValgrindNoLogFile-result.txt
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list