wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 10:41:16 +02:00
Code Activity

Fix help test in dev shell

Browse source 
Not sure what the intent was expecting help.sh to fail in the main suite, but it caused `meson test` to fail inside a `nix develop` shell:

  $ meson test help --print-errorlogs
  ninja: Entering directory `/home/eelco/Dev/nix-master/build'
  1/1 nix-functional-tests:main / help        UNEXPECTEDPASS   4.02s
This commit is contained in:
Eelco Dolstra 2024-11-18 16:07:35 +01:00
parent 2975c2c1d1
commit e0c6ed1c83
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/functional/help.sh
View file

@ -2,6 +2,8 @@
source common.sh source common.sh
[[ $(type -p man) ]] || skipTest "'man' not installed"
# test help output # test help output
nix-build --help nix-build --help

2
tests/functional/meson.build
View file

@ -242,8 +242,6 @@ foreach suite : suites
# Used for target dependency/ordering tracking, not adding compiler flags or anything. # Used for target dependency/ordering tracking, not adding compiler flags or anything.
depends : suite['deps'], depends : suite['deps'],
workdir : workdir, workdir : workdir,
# Won't pass until man pages are generated
should_fail : suite['name'] == 'main' and script == 'help.sh'
) )
endforeach endforeach
endforeach endforeach