global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-03 04:56:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jk/interop-test-build-options'

Browse Source 
The support to customize build options to adjust for older versions
and/or older systems for the interop tests has been improved.

* jk/interop-test-build-options:
  t/interop: allow per-version make options
This commit is contained in:
Junio C Hamano
2024-09-20 11:16:31 -07:00
parent 4c22e57bab 22ef5f02a8
commit 53c7a9643f
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
t/interop/README
View File

@@ -83,3 +83,10 @@ You can then use test_expect_success as usual, with a few differences:
should create one with the appropriate version of git.
At the end of the script, call test_done as usual.
Some older versions may need a few build knobs tweaked (e.g., ancient
versions of Git no longer build with modern OpenSSL). Your script can
set MAKE_OPTS_A and MAKE_OPTS_B, which will be passed alongside
GIT_INTEROP_MAKE_OPTS. Users can override them per-script by setting
GIT_INTEROP_MAKE_OPTS_{A,B} in the environment, just like they can set
GIT_TEST_VERSION_{A,B}.

1
t/interop/i5500-git-daemon.sh
View File

@@ -2,6 +2,7 @@
VERSION_A=.
VERSION_B=v1.0.0
MAKE_OPTS_B="NO_OPENSSL=TooOld"
: ${LIB_GIT_DAEMON_PORT:=5500}
LIB_GIT_DAEMON_COMMAND='git.a daemon'

8
t/interop/interop-lib.sh
View File

@@ -45,7 +45,7 @@ build_version () {
(
cd "$dir" &&
make $GIT_INTEROP_MAKE_OPTS >&2 &&
make $2 $GIT_INTEROP_MAKE_OPTS >&2 &&
touch .built
) || return 1
@@ -76,9 +76,11 @@ generate_wrappers () {
VERSION_A=${GIT_TEST_VERSION_A:-$VERSION_A}
VERSION_B=${GIT_TEST_VERSION_B:-$VERSION_B}
MAKE_OPTS_A=${GIT_INTEROP_MAKE_OPTS_A:-$MAKE_OPTS_A}
MAKE_OPTS_B=${GIT_INTEROP_MAKE_OPTS_B:-$MAKE_OPTS_B}
if ! DIR_A=$(build_version "$VERSION_A") ||
! DIR_B=$(build_version "$VERSION_B")
if ! DIR_A=$(build_version "$VERSION_A" "$MAKE_OPTS_A") ||
! DIR_B=$(build_version "$VERSION_B" "$MAKE_OPTS_B")
then
echo >&2 "fatal: unable to build git versions"
exit 1