summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIsrael Blancas <iblancasa@gmail.com>2018-05-01 18:23:05 (GMT)
committerBrad King <brad.king@kitware.com>2018-05-03 13:35:45 (GMT)
commit46fa1af5142e72558fcd378e12f7ec7d7ee3c90d (patch)
treeac96ac29bf01caca9e270f5ea6046cf55127c447
parent4ac48237a0337a6d36556e0424e44baef38cad9a (diff)
downloadCMake-46fa1af5142e72558fcd378e12f7ec7d7ee3c90d.zip
CMake-46fa1af5142e72558fcd378e12f7ec7d7ee3c90d.tar.gz
CMake-46fa1af5142e72558fcd378e12f7ec7d7ee3c90d.tar.bz2
Tests: Fix CheckSourceTree for in-source non-dashboard builds
For in-source builds we must tolerate non-tracked files in the source tree. Previously we only tolerated them for dashboard builds during automated testing, but we should tolerate them for local user builds too. Fixes: #17868
-rw-r--r--Tests/CMakeTests/CheckSourceTreeTest.cmake.in4
1 files changed, 1 insertions, 3 deletions
diff --git a/Tests/CMakeTests/CheckSourceTreeTest.cmake.in b/Tests/CMakeTests/CheckSourceTreeTest.cmake.in
index 8145db7..4f2aaea 100644
--- a/Tests/CMakeTests/CheckSourceTreeTest.cmake.in
+++ b/Tests/CMakeTests/CheckSourceTreeTest.cmake.in
@@ -308,13 +308,11 @@ message("=======================================================================
if("$ENV{DASHBOARD_TEST_FROM_CTEST}" STREQUAL "")
# developers are allowed to have local additions and modifications...
- set(is_dashboard 0)
message("interactive test run")
message("")
else()
- set(is_dashboard 1)
message("dashboard test run")
message("")
@@ -341,7 +339,7 @@ endif()
# Not even developers.
#
if(nonadditions)
- if(in_source_build AND is_dashboard)
+ if(in_source_build)
message("
warning: test results confounded because this is an 'in-source' build - cannot
distinguish between non-added files that are in-source build products and