summaryrefslogtreecommitdiffstats
path: root/Tests/ExternalProject
diff options
context:
space:
mode:
authorDavid Cole <david.cole@kitware.com>2009-06-29 14:46:45 (GMT)
committerDavid Cole <david.cole@kitware.com>2009-06-29 14:46:45 (GMT)
commitfb81cd93f01cf7d71498a9acd9946ce225dff1a5 (patch)
treedac218e5706e8ff65820f1e924aa7e30cfd905be /Tests/ExternalProject
parentd78ef9a6cd1d9f2e2920773cc4d91f4374bdcedc (diff)
downloadCMake-fb81cd93f01cf7d71498a9acd9946ce225dff1a5.zip
CMake-fb81cd93f01cf7d71498a9acd9946ce225dff1a5.tar.gz
CMake-fb81cd93f01cf7d71498a9acd9946ce225dff1a5.tar.bz2
BUG: Avoid running the cvs portions of the ExternalProject test on non-cygwin builds that are using cygwin cvs.exe.
Diffstat (limited to 'Tests/ExternalProject')
-rw-r--r--Tests/ExternalProject/CMakeLists.txt23
1 files changed, 21 insertions, 2 deletions
diff --git a/Tests/ExternalProject/CMakeLists.txt b/Tests/ExternalProject/CMakeLists.txt
index 650eb5f..e13b399 100644
--- a/Tests/ExternalProject/CMakeLists.txt
+++ b/Tests/ExternalProject/CMakeLists.txt
@@ -119,7 +119,20 @@ ep_add(${proj}
)
+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")
+ message(STATUS "No ExternalProject cvs tests with cygwin cvs.exe outside cygwin!")
+ set(do_cvs_tests 0)
+ endif()
+endif()
+
+if(do_cvs_tests)
# Unzip/untar the CVS repository in our source folder so that other
# projects below may use it to test CVS args of ep_add
#
@@ -182,7 +195,13 @@ if(CVS_EXECUTABLE)
endif()
+set(do_svn_tests 0)
+
if(Subversion_SVN_EXECUTABLE)
+ set(do_svn_tests 1)
+endif()
+
+if(do_svn_tests)
# Unzip/untar the SVN repository in our source folder so that other
# projects below may use it to test SVN args of ep_add
#
@@ -263,7 +282,7 @@ add_test(TutorialStep1-LocalTGZ-BuildTreeTest
add_test(TutorialStep1-LocalNoDirTGZ-BuildTreeTest
"${binary_base}/TutorialStep1-LocalNoDirTGZ/Tutorial" 9)
-if(CVS_EXECUTABLE)
+if(do_cvs_tests)
add_test(TutorialStep1-CVS-20090626-BuildTreeTest
"${binary_base}/TutorialStep1-CVS-20090626/Tutorial" 4)
@@ -274,7 +293,7 @@ if(CVS_EXECUTABLE)
"${binary_base}/TutorialStep1-CVS-HEAD/Tutorial" 81)
endif()
-if(Subversion_SVN_EXECUTABLE)
+if(do_svn_tests)
add_test(TutorialStep1-SVN-20090626-BuildTreeTest
"${binary_base}/TutorialStep1-SVN-20090626/Tutorial" 100)