Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix help test in dev shell #11900

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix help test in dev shell #11900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0754b0a
Fix help test in dev shell
edolstra Nov 18, 2024
9c6f528
Disable help test
edolstra Nov 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions tests/functional/help.sh
View file
Open in desktop
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
4 changes: 1 addition & 3 deletions tests/functional/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ suites = [
'impure-env.sh',
'debugger.sh',
'extra-sandbox-profile.sh',
'help.sh',
#'help.sh',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we want to exclude it unconditionally.

Suggested change
#'help.sh',
'help.sh',

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately one of the VM tests fails without this, see https://github.com/NixOS/nix/actions/runs/11895552419/job/33145394782.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Discussed in meeting
Possible solutions

  • add nix-manual.man manpages to NixOS test common.nix <= preferred
  • add nix (everything.nix) preferably not because that includes the functional tests
  • add a meson option to disable help.sh

],
'workdir': meson.current_source_dir(),
},
Expand Down Expand Up @@ -246,8 +246,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
Loading