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

Jump to bottom

nixos/test-instrumentation: properly import options for qemu-check #95743

Merged
merged 1 commit into from Aug 18, 2020
Merged

nixos/test-instrumentation: properly import options for qemu-check #95743

merged 1 commit into from Aug 18, 2020

Conversation

Ma27
Copy link
Member

@Ma27 Ma27 commented Aug 18, 2020

Motivation for this change

If qemu-vm.nix is imported, the option virtualisation.qemu.consoles
should be set to make sure that the machine's output isn't rendered on
the graphical window of QEMU.

This is needed when interactively running a NixOS test or in conjunction
with nixos-build-vms(8).

The patch 2578557 tries to only do this
if the option actually exists, however this condition used to be always
false since options wasn't imported in the module and pointed to
lib.options due to the with lib;-clause.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@Ma27
nixos/test-instrumentation: properly import options for qemu-check
2fbddb0 
If `qemu-vm.nix` is imported, the option `virtualisation.qemu.consoles`
should be set to make sure that the machine's output isn't rendered on
the graphical window of QEMU.

This is needed when interactively running a NixOS test or in conjunction
with `nixos-build-vms(8)`.

The patch 2578557 tries to only do this
if the option actually exists, however this condition used to be always
false since `options` wasn't imported in the module and pointed to
`lib.options` due to the `with lib;`-clause.
@Ma27 Ma27 requested review from roberth and infinisil August 18, 2020 10:28
@Ma27 Ma27 mentioned this pull request Aug 18, 2020
Merged
10 tasks
roberth
roberth approved these changes Aug 18, 2020
View reviewed changes
Copy link
Member

@roberth roberth left a comment

Choose a reason for hiding this comment

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

I'd recommend removing with lib, but otherwise lgtm.

@infinisil infinisil merged commit cfd599e into NixOS:master Aug 18, 2020
@Ma27 Ma27 deleted the qemu-test-out branch August 18, 2020 12:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@roberth roberth roberth approved these changes

@infinisil infinisil infinisil approved these changes

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@Ma27 @roberth @infinisil