[Cmake-commits] [cmake-commits] david.cole committed CMakeLists.txt 1.96 1.97
cmake-commits at cmake.org
cmake-commits at cmake.org
Fri Jul 24 15:58:25 EDT 2009
Update of /cvsroot/CMake/CMake/Tests
In directory public:/mounts/ram/cvs-serv1394/Tests
Modified Files:
CMakeLists.txt
Log Message:
BUG: Additional fix necessary for issue #8481 so that Xcode builds do not write files into the source tree. Also add a test that runs last to check for local modifications in CMake_SOURCE_DIR based on whether 'cvs -q -n up -dP' output is empty. Test fails on dashboard runs when there are local modifications. Test passes on non-dashboard runs with local modifications so that CMake developers may have mods when running the test locally.
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeLists.txt,v
retrieving revision 1.96
retrieving revision 1.97
diff -C 2 -d -r1.96 -r1.97
*** CMakeLists.txt 20 Jul 2009 14:58:50 -0000 1.96
--- CMakeLists.txt 24 Jul 2009 19:58:22 -0000 1.97
***************
*** 38,41 ****
--- 38,56 ----
ENDIF (CMAKE_RUN_LONG_TESTS)
+ # Should tests that use CVS be run?
+ #
+ find_package(CVS)
+ set(do_cvs_tests 0)
+
+ if(CVS_EXECUTABLE)
+ set(do_cvs_tests 1)
+ endif()
+
+ if(do_cvs_tests AND NOT UNIX)
+ if("${CVS_EXECUTABLE}" MATCHES "cygwin")
+ set(do_cvs_tests 0)
+ endif()
+ endif()
+
# Should CPack tests be run? By default, yes, but...
#
***************
*** 948,954 ****
SET(CTEST_TEST_UPDATE_BZR 0)
IF(BZR_EXECUTABLE)
! IF(NOT "${CVS_EXECUTABLE}" MATCHES "cygwin" OR UNIX)
SET(CTEST_TEST_UPDATE_BZR 1)
! ENDIF(NOT "${CVS_EXECUTABLE}" MATCHES "cygwin" OR UNIX)
ENDIF(BZR_EXECUTABLE)
IF(CTEST_TEST_UPDATE_BZR)
--- 963,969 ----
SET(CTEST_TEST_UPDATE_BZR 0)
IF(BZR_EXECUTABLE)
! IF(NOT "${BZR_EXECUTABLE}" MATCHES "cygwin" OR UNIX)
SET(CTEST_TEST_UPDATE_BZR 1)
! ENDIF(NOT "${BZR_EXECUTABLE}" MATCHES "cygwin" OR UNIX)
ENDIF(BZR_EXECUTABLE)
IF(CTEST_TEST_UPDATE_BZR)
***************
*** 980,986 ****
SET(CTEST_TEST_UPDATE_GIT 0)
IF(GIT_EXECUTABLE)
! IF(NOT "${CVS_EXECUTABLE}" MATCHES "cygwin" OR UNIX)
SET(CTEST_TEST_UPDATE_GIT 1)
! ENDIF(NOT "${CVS_EXECUTABLE}" MATCHES "cygwin" OR UNIX)
ENDIF(GIT_EXECUTABLE)
IF(CTEST_TEST_UPDATE_GIT)
--- 995,1001 ----
SET(CTEST_TEST_UPDATE_GIT 0)
IF(GIT_EXECUTABLE)
! IF(NOT "${GIT_EXECUTABLE}" MATCHES "cygwin" OR UNIX)
SET(CTEST_TEST_UPDATE_GIT 1)
! ENDIF(NOT "${GIT_EXECUTABLE}" MATCHES "cygwin" OR UNIX)
ENDIF(GIT_EXECUTABLE)
IF(CTEST_TEST_UPDATE_GIT)
***************
*** 999,1005 ****
SET(CTEST_TEST_UPDATE_HG 0)
IF(HG_EXECUTABLE)
! IF(NOT "${CVS_EXECUTABLE}" MATCHES "cygwin" OR UNIX)
SET(CTEST_TEST_UPDATE_HG 1)
! ENDIF(NOT "${CVS_EXECUTABLE}" MATCHES "cygwin" OR UNIX)
ENDIF(HG_EXECUTABLE)
IF(CTEST_TEST_UPDATE_HG)
--- 1014,1020 ----
SET(CTEST_TEST_UPDATE_HG 0)
IF(HG_EXECUTABLE)
! IF(NOT "${HG_EXECUTABLE}" MATCHES "cygwin" OR UNIX)
SET(CTEST_TEST_UPDATE_HG 1)
! ENDIF(NOT "${HG_EXECUTABLE}" MATCHES "cygwin" OR UNIX)
ENDIF(HG_EXECUTABLE)
IF(CTEST_TEST_UPDATE_HG)
***************
*** 1237,1238 ****
--- 1252,1259 ----
SUBDIRS(CMakeTests)
+
+ if(BUILD_TESTING)
+ if(do_cvs_tests)
+ add_test(IsSourceTreeUnmodified ${CMAKE_CMAKE_COMMAND} -P "IsSourceTreeUnmodified.cmake")
+ endif(do_cvs_tests)
+ endif(BUILD_TESTING)
More information about the Cmake-commits
mailing list