Skip to content

Commit 559b80a

Browse files
committed
GHA: Make the reftests pass with the macos GHA runner-images >= 20250928
1 parent 9d9d2d2 commit 559b80a

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

master_changes.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ users)
142142
* Add a test showing the behaviour of `opam var <pkg>:opamfile` [#6659 @kit-ty-kate]
143143
* Add a test to show homogeneity of outputs on verbose between sandboxed and non sandboxed commands (with `-vv`) [#6675 @rjbou]
144144
* Update `sed-cmd` reftest reftest [#6675 @rjbou]
145+
* Fix `env.test` in cases where calling `env` inside of a script outputs a `__CF_USER_TEXT_ENCODING` environment variable that isn't present in `sh -c env` [#6719 @kit-ty-kate]
145146

146147
### Engine
147148
* Fix gcc < 14.3 bug on mingw i686 [#6624 @kit-ty-kate]

tests/reftests/env.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ opam-version: "2.0"
581581
build: [ "sh" "getenv.sh" "1" ]
582582
### <pkg:to-build.2:getenv.sh>
583583
out=build-env
584-
fromtest="^PATH=\|^MANPATH=\|^LOCALENV=\|^TEMPDIR=\|^TMPDIR=\|^TMP=\|^TEMP=\|^SHLVL=\|^PWD=\|^_="
584+
fromtest="^PATH=\|^MANPATH=\|^LOCALENV=\|^TEMPDIR=\|^TMPDIR=\|^TMP=\|^TEMP=\|^SHLVL=\|^PWD=\|^_=\|^__CF_USER_TEXT_ENCODING="
585585
for v in $LOCALENV; do
586586
if echo "$v" | grep -q "=" ; then
587587
fromtest="$fromtest\\|^$(echo "$v" | cut -f 1 -d '=')="

0 commit comments

Comments
 (0)