mirror of
https://github.com/git/git.git
synced 2024-06-09 15:16:11 +02:00
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
This commit is contained in:
commit
246eedf2bc
|
@ -1,4 +1,5 @@
|
||||||
/fuzz_corpora
|
/fuzz_corpora
|
||||||
|
/GIT-BUILD-DIR
|
||||||
/GIT-BUILD-OPTIONS
|
/GIT-BUILD-OPTIONS
|
||||||
/GIT-CFLAGS
|
/GIT-CFLAGS
|
||||||
/GIT-LDFLAGS
|
/GIT-LDFLAGS
|
||||||
|
|
1
Makefile
1
Makefile
|
@ -3042,6 +3042,7 @@ else
|
||||||
@echo RUNTIME_PREFIX=\'false\' >>$@+
|
@echo RUNTIME_PREFIX=\'false\' >>$@+
|
||||||
endif
|
endif
|
||||||
@if cmp $@+ $@ >/dev/null 2>&1; then $(RM) $@+; else mv $@+ $@; fi
|
@if cmp $@+ $@ >/dev/null 2>&1; then $(RM) $@+; else mv $@+ $@; fi
|
||||||
|
@if test -f GIT-BUILD-DIR; then rm GIT-BUILD-DIR; fi
|
||||||
|
|
||||||
### Detect Python interpreter path changes
|
### Detect Python interpreter path changes
|
||||||
ifndef NO_PYTHON
|
ifndef NO_PYTHON
|
||||||
|
|
|
@ -1074,18 +1074,14 @@ endif()
|
||||||
#Make the tests work when building out of the source tree
|
#Make the tests work when building out of the source tree
|
||||||
get_filename_component(CACHE_PATH ${CMAKE_CURRENT_LIST_DIR}/../../CMakeCache.txt ABSOLUTE)
|
get_filename_component(CACHE_PATH ${CMAKE_CURRENT_LIST_DIR}/../../CMakeCache.txt ABSOLUTE)
|
||||||
if(NOT ${CMAKE_BINARY_DIR}/CMakeCache.txt STREQUAL ${CACHE_PATH})
|
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
|
#Setting the build directory in test-lib.sh before running tests
|
||||||
file(WRITE ${CMAKE_BINARY_DIR}/CTestCustom.cmake
|
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(WRITE ${CMAKE_SOURCE_DIR}/GIT-BUILD-DIR \"${CMAKE_BINARY_DIR}\")")
|
||||||
"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})")
|
|
||||||
#misc copies
|
#misc copies
|
||||||
file(COPY ${CMAKE_SOURCE_DIR}/t/chainlint.pl 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}/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-prompt.sh DESTINATION ${CMAKE_BINARY_DIR}/contrib/completion/)
|
||||||
file(COPY ${CMAKE_SOURCE_DIR}/contrib/completion/git-completion.bash DESTINATION ${CMAKE_BINARY_DIR}/contrib/completion/)
|
file(COPY ${CMAKE_SOURCE_DIR}/contrib/completion/git-completion.bash DESTINATION ${CMAKE_BINARY_DIR}/contrib/completion/)
|
||||||
endif()
|
endif()
|
||||||
|
@ -1095,8 +1091,12 @@ file(GLOB test_scipts "${CMAKE_SOURCE_DIR}/t/t[0-9]*.sh")
|
||||||
#test
|
#test
|
||||||
foreach(tsh ${test_scipts})
|
foreach(tsh ${test_scipts})
|
||||||
add_test(NAME ${tsh}
|
add_test(NAME ${tsh}
|
||||||
COMMAND ${SH_EXE} ${tsh}
|
COMMAND ${SH_EXE} ${tsh} --no-bin-wrappers --no-chain-lint -vx
|
||||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/t)
|
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/t)
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
|
# This test script takes an extremely long time and is known to time out even
|
||||||
|
# on fast machines because it requires in excess of one hour to run
|
||||||
|
set_tests_properties("${CMAKE_SOURCE_DIR}/t/t7112-reset-submodule.sh" PROPERTIES TIMEOUT 4000)
|
||||||
|
|
||||||
endif()#BUILD_TESTING
|
endif()#BUILD_TESTING
|
||||||
|
|
|
@ -47,6 +47,16 @@ then
|
||||||
echo "PANIC: Running in a $TEST_DIRECTORY that doesn't end in '/t'?" >&2
|
echo "PANIC: Running in a $TEST_DIRECTORY that doesn't end in '/t'?" >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
if test -f "$GIT_BUILD_DIR/GIT-BUILD-DIR"
|
||||||
|
then
|
||||||
|
GIT_BUILD_DIR="$(cat "$GIT_BUILD_DIR/GIT-BUILD-DIR")" || exit 1
|
||||||
|
# On Windows, we must convert Windows paths lest they contain a colon
|
||||||
|
case "$(uname -s)" in
|
||||||
|
*MINGW*)
|
||||||
|
GIT_BUILD_DIR="$(cygpath -au "$GIT_BUILD_DIR")"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
|
||||||
# Prepend a string to a VAR using an arbitrary ":" delimiter, not
|
# Prepend a string to a VAR using an arbitrary ":" delimiter, not
|
||||||
# adding the delimiter if VAR or VALUE is empty. I.e. a generalized:
|
# adding the delimiter if VAR or VALUE is empty. I.e. a generalized:
|
||||||
|
|
Loading…
Reference in New Issue