nordic-dev.net/nix
nordic-dev.net/nix
2
0
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2024-11-21 22:32:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11532 from Mic92/macos-test-fix

Browse Source 
tests/functional/shell: fix test in macOS devshell
This commit is contained in:
Eelco Dolstra 2024-09-18 21:43:49 +02:00 committed by GitHub
commit 59acf3b75c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/functional/shell.sh
View File

@ -31,11 +31,13 @@ env > $TEST_ROOT/expected-env
nix shell -f shell-hello.nix hello -c env > $TEST_ROOT/actual-env nix shell -f shell-hello.nix hello -c env > $TEST_ROOT/actual-env
# Remove/reset variables we expect to be different. # Remove/reset variables we expect to be different.
# - PATH is modified by nix shell # - PATH is modified by nix shell
# - we unset TMPDIR on macOS if it contains /var/folders
# - _ is set by bash and is expectedf to differ because it contains the original command # - _ is set by bash and is expectedf to differ because it contains the original command
# - __CF_USER_TEXT_ENCODING is set by macOS and is beyond our control # - __CF_USER_TEXT_ENCODING is set by macOS and is beyond our control
sed -i \ sed -i \
-e 's/PATH=.*/PATH=.../' \ -e 's/PATH=.*/PATH=.../' \
-e 's/_=.*/_=.../' \ -e 's/_=.*/_=.../' \
-e '/^TMPDIR=\/var\/folders\/.*/d' \
-e '/^__CF_USER_TEXT_ENCODING=.*$/d' \ -e '/^__CF_USER_TEXT_ENCODING=.*$/d' \
$TEST_ROOT/expected-env $TEST_ROOT/actual-env $TEST_ROOT/expected-env $TEST_ROOT/actual-env
sort $TEST_ROOT/expected-env > $TEST_ROOT/expected-env.sorted sort $TEST_ROOT/expected-env > $TEST_ROOT/expected-env.sorted