[Cmake-commits] CMake branch, next, updated. v3.4.1-1682-g987c2cf

[Brad King]

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  987c2cf1d8ae76df4bf5bfc93745d898f981bff7 (commit)
       via  e4b7c4e3c9ab8d95c41d9c8fac4d06cfc7407625 (commit)
      from  3c09aff91048787b6d3a019b36a81e1bd3a8562f (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=987c2cf1d8ae76df4bf5bfc93745d898f981bff7
commit 987c2cf1d8ae76df4bf5bfc93745d898f981bff7
Merge: 3c09aff e4b7c4e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 10 11:20:13 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Dec 10 11:20:13 2015 -0500

    Merge topic 'simplify-CTest.UpdateGIT-test' into next
    
    e4b7c4e3 Tests: Simplify CTest.UpdateGIT repo path construction


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e4b7c4e3c9ab8d95c41d9c8fac4d06cfc7407625
commit e4b7c4e3c9ab8d95c41d9c8fac4d06cfc7407625
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 10 11:16:11 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Dec 10 11:18:45 2015 -0500

    Tests: Simplify CTest.UpdateGIT repo path construction
    
    Avoid constructing full paths to .git repositories in the test.  Use
    relative paths and let Git convert them to absolute paths internally.
    This is simpler and also avoids trouble with various absolute path root
    component conventions on Windows (`c:/`, `/c/`, `/cygdrive/c/`).

diff --git a/Tests/CTestUpdateGIT.cmake.in b/Tests/CTestUpdateGIT.cmake.in
index 6488a1f..4731f9e 100644
--- a/Tests/CTestUpdateGIT.cmake.in
+++ b/Tests/CTestUpdateGIT.cmake.in
@@ -41,7 +41,6 @@ run_child(
   COMMAND ${GIT} --bare init
   )
 file(REMOVE_RECURSE ${TOP}/repo.git/hooks)
-set(REPO file://${TOP}/repo.git)
 
 # Create submodule repository.
 message("Creating submodule...")
@@ -51,17 +50,13 @@ run_child(
   COMMAND ${GIT} --bare init
   )
 file(REMOVE_RECURSE ${TOP}/module.git/hooks)
-set(MOD_REPO file://${TOP}/module.git)
-create_content(module)
-run_child(WORKING_DIRECTORY ${TOP}/module
-  COMMAND ${GIT} init
+run_child(WORKING_DIRECTORY ${TOP}
+  COMMAND ${GIT} clone module.git module
   )
 file(REMOVE_RECURSE ${TOP}/module/.git/hooks)
 file(APPEND ${TOP}/module/.git/config "
-[remote \"origin\"]
-\turl = ${MOD_REPO}
-\tfetch = +refs/heads/*:refs/remotes/origin/*
 ${AUTHOR_CONFIG}")
+create_content(module)
 run_child(WORKING_DIRECTORY ${TOP}/module
   COMMAND ${GIT} add .
   )
@@ -85,9 +80,6 @@ run_child(WORKING_DIRECTORY ${TOP}/import
   )
 file(REMOVE_RECURSE ${TOP}/import/.git/hooks)
 file(APPEND ${TOP}/import/.git/config "
-[remote \"origin\"]
-\turl = ${REPO}
-\tfetch = +refs/heads/*:refs/remotes/origin/*
 ${AUTHOR_CONFIG}")
 run_child(WORKING_DIRECTORY ${TOP}/import
   COMMAND ${GIT} add .
@@ -96,13 +88,13 @@ run_child(WORKING_DIRECTORY ${TOP}/import
   COMMAND ${GIT} config core.safecrlf false
   )
 run_child(WORKING_DIRECTORY ${TOP}/import
-  COMMAND ${GIT} submodule add ${MOD_REPO} module
+  COMMAND ${GIT} submodule add ../module.git module
   )
 run_child(WORKING_DIRECTORY ${TOP}/import
   COMMAND ${GIT} commit -m "Initial content"
   )
 run_child(WORKING_DIRECTORY ${TOP}/import
-  COMMAND ${GIT} push origin master:refs/heads/master
+  COMMAND ${GIT} push ../repo.git master:refs/heads/master
   )
 
 #-----------------------------------------------------------------------------
@@ -123,7 +115,7 @@ run_child(WORKING_DIRECTORY ${TOP}/module
 message("Checking out revision 1...")
 run_child(
   WORKING_DIRECTORY ${TOP}
-  COMMAND ${GIT} clone ${REPO} user-source
+  COMMAND ${GIT} clone repo.git user-source
   )
 file(REMOVE_RECURSE ${TOP}/user-source/.git/hooks)
 file(APPEND ${TOP}/user-source/.git/config "${AUTHOR_CONFIG}")
@@ -278,7 +270,7 @@ set(CTEST_GIT_COMMAND \"${GIT}\")
 set(CTEST_GIT_UPDATE_OPTIONS)
 execute_process(
   WORKING_DIRECTORY \"${TOP}\"
-  COMMAND \"${GIT}\" clone \"${REPO}\" dash-source
+  COMMAND \"${GIT}\" clone repo.git dash-source
   )
 
 # Test .git file.

-----------------------------------------------------------------------

Summary of changes:
 Tests/CTestUpdateGIT.cmake.in |   22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
CMake