Commit 4c7e2615 authored by William R. Dieter's avatar William R. Dieter Committed by Brad King
Browse files

Tests: Use the CVS :local: access method for local directories

Windows absolute paths start with a drive letter, followed by the path.
Without an explicit access method specification, CVS treats the drive
letter as a host name.  This changes explicitly adds `:local:` to local
directory repository paths used in tests to avoid this confusion.

See the CVS Manual [1] for more information.

[1] https://www.gnu.org/software/trans-coord/manual/cvs/cvs.html#Repository

Signed-off-by: William R. Dieter's avatarWilliam R. Dieter <william.r.dieter@intel.com>
parent 549eedfe
...@@ -17,21 +17,11 @@ message("Using CVS tools:") ...@@ -17,21 +17,11 @@ message("Using CVS tools:")
set(CVS "@CVS_EXECUTABLE@") set(CVS "@CVS_EXECUTABLE@")
message(" cvs = ${CVS}") message(" cvs = ${CVS}")
set(REPO ${TOP}/repo) # Pre-pending :local: prevents cvs from trying to interpret Windows drive
# letters, like "C:", as host names.
# The MSYS cvs tool interprets "c:/" as a "machine:" name for SSH. set(REPO ":local:${TOP}/repo")
# Detect the MSYS cvs and convert the repo path to an MSYS path.
if(WIN32)
if(EXISTS "${CVS}")
file(STRINGS "${CVS}" cvs_is_msys LIMIT_COUNT 1 REGEX "[Mm][Ss][Yy][Ss]")
if(cvs_is_msys)
message(" '${CVS}' is from MSYS (contains '${cvs_is_msys}')")
string(REGEX REPLACE "^([A-Za-z]):" "/\\1" REPO "${REPO}")
endif()
endif()
endif()
set(CVSCMD ${CVS} -d${REPO}) set(CVSCMD ${CVS} -d "${REPO}")
# CVSNT requires an extra option to 'cvs init'. # CVSNT requires an extra option to 'cvs init'.
set(CVS_INIT_OPT) set(CVS_INIT_OPT)
......
...@@ -161,7 +161,7 @@ if(do_cvs_tests) ...@@ -161,7 +161,7 @@ if(do_cvs_tests)
# #
set(proj TutorialStep1-CVS-20090626) set(proj TutorialStep1-CVS-20090626)
ExternalProject_Add(${proj} ExternalProject_Add(${proj}
CVS_REPOSITORY "${local_cvs_repo}" CVS_REPOSITORY ":local:${local_cvs_repo}"
CVS_MODULE "TutorialStep1" CVS_MODULE "TutorialStep1"
CVS_TAG "-D2009-06-26 16:50:00 UTC" CVS_TAG "-D2009-06-26 16:50:00 UTC"
UPDATE_COMMAND "" UPDATE_COMMAND ""
...@@ -176,7 +176,7 @@ if(do_cvs_tests) ...@@ -176,7 +176,7 @@ if(do_cvs_tests)
# #
set(proj TutorialStep1-CVS-testtag1) set(proj TutorialStep1-CVS-testtag1)
ExternalProject_Add(${proj} ExternalProject_Add(${proj}
CVS_REPOSITORY "${local_cvs_repo}" CVS_REPOSITORY ":local:${local_cvs_repo}"
CVS_MODULE "TutorialStep1" CVS_MODULE "TutorialStep1"
CVS_TAG -rtesttag1 CVS_TAG -rtesttag1
UPDATE_COMMAND "" UPDATE_COMMAND ""
...@@ -191,7 +191,7 @@ if(do_cvs_tests) ...@@ -191,7 +191,7 @@ if(do_cvs_tests)
# #
set(proj TutorialStep1-CVS-HEAD) set(proj TutorialStep1-CVS-HEAD)
ExternalProject_Add(${proj} ExternalProject_Add(${proj}
CVS_REPOSITORY "${local_cvs_repo}" CVS_REPOSITORY ":local:${local_cvs_repo}"
CVS_MODULE "TutorialStep1" CVS_MODULE "TutorialStep1"
CMAKE_GENERATOR "${CMAKE_GENERATOR}" CMAKE_GENERATOR "${CMAKE_GENERATOR}"
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment