Skip to content

Commit

Permalink
Fix help test in dev shell
Browse files Browse the repository at this point in the history
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
  • Loading branch information
edolstra committed Jan 22, 2025
1 parent 2975c2c commit e0c6ed1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 2 additions & 0 deletions tests/functional/help.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

source common.sh

[[ $(type -p man) ]] || skipTest "'man' not installed"

# test help output

nix-build --help
Expand Down
2 changes: 0 additions & 2 deletions tests/functional/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -242,8 +242,6 @@ foreach suite : suites
# Used for target dependency/ordering tracking, not adding compiler flags or anything.
depends : suite['deps'],
workdir : workdir,
# Won't pass until man pages are generated
should_fail : suite['name'] == 'main' and script == 'help.sh'
)
endforeach
endforeach

0 comments on commit e0c6ed1

Please sign in to comment.