From: Patrick Steinhardt <ps@pks.im>
Date: Tue, 18 Feb 2025 07:45:59 +0000 (+0100)
Subject: ci: fix propagating UTF-8 test locale in musl-based Meson job
X-Git-Tag: v2.49.0-rc1~3^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=235fe77c2990ca6762ad9146105915987acf956d;p=thirdparty%2Fgit.git

ci: fix propagating UTF-8 test locale in musl-based Meson job

The musl-based Meson job is supposed to explicitly specify the UTF-8
locale used for testing, which has been introduced with 84bb5eeace7 (ci:
switch linux-musl to use Meson, 2025-01-28). That commit had two issues
though:

  - We continue to refer to "linux-musl", even though the job has been
    renamed in the same commit to "linux-musl-meson".

  - We use the wrong option name to specify the locale. This was not
    noticed though due to the first issue.

Fix both of these issues by fixing both the job and option naems.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/ci/lib.sh b/ci/lib.sh
index 028fea0e7b..84d1145265 100755
--- a/ci/lib.sh
+++ b/ci/lib.sh
@@ -348,8 +348,8 @@ case "$jobname" in
 linux32)
 	CC=gcc
 	;;
-linux-musl)
-	MESONFLAGS="$MESONFLAGS -DGIT_TEST_UTF8_LOCALE=C.UTF-8"
+linux-musl-meson)
+	MESONFLAGS="$MESONFLAGS -Dtest_utf8_locale=C.UTF-8"
 	;;
 linux-leaks|linux-reftable-leaks)
 	export SANITIZE=leak