internal/rosa/package/meson: respect CLICOLOR_FORCE
Test / Create distribution (push) Successful in 1m25s
Test / Sandbox (push) Successful in 4m4s
Test / Hakurei (push) Successful in 7m11s
Test / Sandbox (race detector) (push) Successful in 8m43s
Test / Hakurei (race detector) (push) Successful in 11m32s
Test / ShareFS (push) Successful in 15m2s
Test / Flake checks (push) Successful in 1m37s

Upstream had ticket and patch available since 2017, still unmerged and refuses to support the environment variable, so patch it in. This also strips out the variable for test execution to work around buggy test suites like glib.

Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
cat
2026-07-30 08:50:57 +09:00
parent 30cd960117
commit d3f675a708
2 changed files with 17 additions and 1 deletions
+4 -1
View File
@@ -9,7 +9,10 @@ package meson {
tag = version;
checksum = "9AMilGxTOVqPA2DaGMASyuVs1BeTzgDZ0NH2oSYoRZk846ApvfOBa4cc18XEEK7M";
};
patches = [ "respect-colour.patch" ];
patches = [
"respect-colour.patch",
"test-strip-colour.patch",
];
env = [
"CMAKE_MAKE_PROGRAM=ninja",
@@ -0,0 +1,13 @@
diff --git a/mesonbuild/mtest.py b/mesonbuild/mtest.py
index 0661fa529..34ab36aa9 100644
--- a/mesonbuild/mtest.py
+++ b/mesonbuild/mtest.py
@@ -1817,6 +1817,8 @@ class TestHarness:
test.exe_wrapper and test.exe_wrapper.found()):
env['MESON_EXE_WRAPPER'] = join_args(test.exe_wrapper.get_command())
env['MESON_TEST_ITERATION'] = str(iteration + 1)
+ env.pop('CLICOLOR_FORCE')
+ env.pop('FORCE_COLOR')
return SingleTestRunner(test, env, name, options)
def process_test_result(self, result: TestRun) -> None: