Merge branch 'js/cmake-updates'

Update to build procedure with VS using CMake/CTest.

* js/cmake-updates:
  cmake: increase time-out for a long-running test
  cmake: avoid editing t/test-lib.sh
  add -p: avoid ambiguous signed/unsigned comparison
  cmake: copy the merge tools for testing
  cmake: make it easier to diagnose regressions in CTest runs

diff --cc .gitignore
index 62720c6135d02fb5f1f533ce79249ebd7b8a3454,b72ddf093469bbdab5fbaa80af7e7929e2314a80..cb0231fb4019fca79a142ababe534fd7fc0a38a1
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -1,4 -1,8 +1,5 @@@
 -/fuzz-commit-graph
  /fuzz_corpora
 -/fuzz-pack-headers
 -/fuzz-pack-idx
+ /GIT-BUILD-DIR
  /GIT-BUILD-OPTIONS
  /GIT-CFLAGS
  /GIT-LDFLAGS

diff --cc Makefile
Simple merge

diff --cc contrib/buildsystems/CMakeLists.txt
index 787738e6fa3377297e83deea54507e9e05b944b6,b1306f95256857fb6f9b8083352efe428f4c05a5..3957e4cf8cd5be6e2524b50a51032d6a0b811aaa
--- 1/contrib/buildsystems/CMakeLists.txt
--- 2/contrib/buildsystems/CMakeLists.txt
+++ b/contrib/buildsystems/CMakeLists.txt
@@@ -1074,18 -1067,14 +1074,14 @@@ endif(
  #Make the tests work when building out of the source tree
  get_filename_component(CACHE_PATH ${CMAKE_CURRENT_LIST_DIR}/../../CMakeCache.txt ABSOLUTE)
  if(NOT ${CMAKE_BINARY_DIR}/CMakeCache.txt STREQUAL ${CACHE_PATH})
-       file(RELATIVE_PATH BUILD_DIR_RELATIVE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}/CMakeCache.txt)
-       string(REPLACE "/CMakeCache.txt" "" BUILD_DIR_RELATIVE ${BUILD_DIR_RELATIVE})
        #Setting the build directory in test-lib.sh before running tests
        file(WRITE ${CMAKE_BINARY_DIR}/CTestCustom.cmake
-               "file(STRINGS ${CMAKE_SOURCE_DIR}/t/test-lib.sh GIT_BUILD_DIR_REPL REGEX \"GIT_BUILD_DIR=(.*)\")\n"
-               "file(STRINGS ${CMAKE_SOURCE_DIR}/t/test-lib.sh content NEWLINE_CONSUME)\n"
-               "string(REPLACE \"\${GIT_BUILD_DIR_REPL}\" \"GIT_BUILD_DIR=\\\"$TEST_DIRECTORY/../${BUILD_DIR_RELATIVE}\\\"\" content \"\${content}\")\n"
-               "file(WRITE ${CMAKE_SOURCE_DIR}/t/test-lib.sh \${content})")
+               "file(WRITE ${CMAKE_SOURCE_DIR}/GIT-BUILD-DIR \"${CMAKE_BINARY_DIR}\")")
        #misc copies
 -      file(COPY ${CMAKE_SOURCE_DIR}/t/chainlint.sed DESTINATION ${CMAKE_BINARY_DIR}/t/)
 +      file(COPY ${CMAKE_SOURCE_DIR}/t/chainlint.pl DESTINATION ${CMAKE_BINARY_DIR}/t/)
        file(COPY ${CMAKE_SOURCE_DIR}/po/is.po DESTINATION ${CMAKE_BINARY_DIR}/po/)
-       file(COPY ${CMAKE_SOURCE_DIR}/mergetools/tkdiff DESTINATION ${CMAKE_BINARY_DIR}/mergetools/)
+       file(GLOB mergetools "${CMAKE_SOURCE_DIR}/mergetools/*")
+       file(COPY ${mergetools} DESTINATION ${CMAKE_BINARY_DIR}/mergetools/)
        file(COPY ${CMAKE_SOURCE_DIR}/contrib/completion/git-prompt.sh DESTINATION ${CMAKE_BINARY_DIR}/contrib/completion/)
        file(COPY ${CMAKE_SOURCE_DIR}/contrib/completion/git-completion.bash DESTINATION ${CMAKE_BINARY_DIR}/contrib/completion/)
  endif()

diff --cc t/test-lib.sh
Simple merge