[Cmake-commits] CMake branch, next, updated. v3.8.0-rc4-637-g38bbe41
Kitware Robot
kwrobot at kitware.com
Fri Mar 31 13:55:02 EDT 2017
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, next has been updated
via 38bbe4194727fc94415c44be41fe8270ef12e0e9 (commit)
via 72d0f947136f535fe7486f9b02caddb33f66eea1 (commit)
from cb99a240757033952b8aeaed2a1839c06ed9fd22 (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=38bbe4194727fc94415c44be41fe8270ef12e0e9
commit 38bbe4194727fc94415c44be41fe8270ef12e0e9
Merge: cb99a24 72d0f94
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Mar 31 17:51:25 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Mar 31 13:51:29 2017 -0400
Stage topic 'test-fix-CTestTestChecksum-dir'
Topic-id: 23428
Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/650
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=72d0f947136f535fe7486f9b02caddb33f66eea1
commit 72d0f947136f535fe7486f9b02caddb33f66eea1
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Mar 31 13:43:44 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Mar 31 13:46:08 2017 -0400
Tests: Fix spurious CTestTestParallel failures
If `CTestTestParallel` was run at the same time as `CTestTestChecksum`
(e.g. during parallel testing) then the former fails due to the latter
stepping on its directory. Fix the directory used for the latter to
avoid the conflict.
diff --git a/Tests/CTestTestChecksum/test.cmake.in b/Tests/CTestTestChecksum/test.cmake.in
index 32d62bb..2a435d2 100644
--- a/Tests/CTestTestChecksum/test.cmake.in
+++ b/Tests/CTestTestChecksum/test.cmake.in
@@ -5,8 +5,8 @@ set(CTEST_DASHBOARD_ROOT "@CMake_BINARY_DIR@/Tests/CTestTest")
set(CTEST_SITE "@SITE@")
set(CTEST_BUILD_NAME "CTestTest- at BUILDNAME@-Checksum")
-set(CTEST_SOURCE_DIRECTORY "@CMake_SOURCE_DIR@/Tests/CTestTestParallel")
-set(CTEST_BINARY_DIRECTORY "@CMake_BINARY_DIR@/Tests/CTestTestParallel")
+set(CTEST_SOURCE_DIRECTORY "@CMake_SOURCE_DIR@/Tests/CTestTestChecksum")
+set(CTEST_BINARY_DIRECTORY "@CMake_BINARY_DIR@/Tests/CTestTestChecksum")
set(CTEST_CVS_COMMAND "@CVSCOMMAND@")
set(CTEST_CMAKE_GENERATOR "@CMAKE_GENERATOR@")
set(CTEST_CMAKE_GENERATOR_PLATFORM "@CMAKE_GENERATOR_PLATFORM@")
-----------------------------------------------------------------------
Summary of changes:
Tests/CTestTestChecksum/test.cmake.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list