| Message ID | 9faca9d5cbe706c00d03ca2a125f2e113294a548.1666090745.git.gitgitgadget@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 6a83b5f081086d3a3d1c3cb8b6a8aad660b705ab |
| Headers | show |
| Series | Some fixes and an improvement for using CTest on Windows | expand |
On Tue, Oct 18 2022, Johannes Schindelin via GitGitGadget wrote: > From: Johannes Schindelin <johannes.schindelin@gmx.de> > > Even when running the tests via CTest, t7609 and t7610 rely on more than > only a few mergetools to be copied to the build directory. Let's make it > so. > > Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> > --- > contrib/buildsystems/CMakeLists.txt | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt > index 6ac20bc5054..0c741e7d878 100644 > --- a/contrib/buildsystems/CMakeLists.txt > +++ b/contrib/buildsystems/CMakeLists.txt > @@ -1078,7 +1078,8 @@ if(NOT ${CMAKE_BINARY_DIR}/CMakeCache.txt STREQUAL ${CACHE_PATH}) > #misc copies > file(COPY ${CMAKE_SOURCE_DIR}/t/chainlint.sed 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() I mentioned that I hacked up a "root cause fix" for some issues in cmake in 1/5. Continuing that this works, but is really just a hack-for-the-hack fix, where we should fix the root cause: Which actually, is really simple: https://github.com/avar/git/commit/30f2265fd07aee97ea66f6e84a824d85d241e245 As you know we fake up the $GIT_BUILD_DIR for cmake, but then later in the recipe (i.e. here) we have to scurry around and adjust that because for some stuff we mean contrib/buildsystems/out/<path>, whereas in others we mean the original <path>. So here (and this isn't on you, we had this before) if you run "cmake" and e.g. tweak the mergetools sources we'll need to re-copy them, blah blah blah. But we can just ... not copy it at all, and have the test-lib.sh learn that some stuff it needs from whatever the "build dir" is, but other stuff is *always* relative to the root of the project. So, for most of that & the context it simply goes away, we don't need to copy po/is.po, the tests can just know where to find it, ditto mergetools/tkdiff (which is not generated), and the bash completion.
diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt index 6ac20bc5054..0c741e7d878 100644 --- a/contrib/buildsystems/CMakeLists.txt +++ b/contrib/buildsystems/CMakeLists.txt @@ -1078,7 +1078,8 @@ if(NOT ${CMAKE_BINARY_DIR}/CMakeCache.txt STREQUAL ${CACHE_PATH}) #misc copies file(COPY ${CMAKE_SOURCE_DIR}/t/chainlint.sed 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()