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

Machine.pm: tweak to look for graphical target in waitForX #38174

Merged
merged 1 commit into from
Apr 4, 2018
Merged

Machine.pm: tweak to look for graphical target in waitForX #38174

merged 1 commit into from
Apr 4, 2018
+1 −1

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Mar 31, 2018

Current message may not be printed
(nothing in systemd contains that string,
it comes from elsewhere)

This fixes NixOS tests w/musl,
and "should" be okay elsewhere O:).

I've tested a number of NixOS tests
to ensure this works for at least
the basic or obviously relevant tests.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

Sorry, something went wrong.

@GrahamcOfBorg GrahamcOfBorg added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Mar 31, 2018
@dtzWill
Copy link
Member Author

dtzWill commented Mar 31, 2018

@GrahamcOfBorg test sddm slim systemd

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: tests.sddm, tests.slim, tests.systemd

Partial log (click to expand)

syncing
machine: running command: sync
machine: exit status 0
test script finished in 104.47s
cleaning up
killing machine (pid 593)
vde_switch: EOF on stdin, cleaning up and exiting
vde_switch: Could not remove ctl dir '/build/vde1.ctl': Directory not empty
/nix/store/y9pdza5wkaqlaj73y3sla5rnqhrm7m05-vm-test-run-slim
/nix/store/a3bjwjh3pblp24g99sjafxwkv93akm6z-vm-test-run-systemd

@dtzWill
Copy link
Member Author

dtzWill commented Mar 31, 2018

Suggestions for reviewers?

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: tests.sddm, tests.slim, tests.systemd

Partial log (click to expand)

strip is /nix/store/j7d4mr0ikv974ig7yzhknpsq288js4bs-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/lj04rld3qbxnkfpnskcs1dd2wdfwhin2-nixos-test-driver/lib  /nix/store/lj04rld3qbxnkfpnskcs1dd2wdfwhin2-nixos-test-driver/bin
patching script interpreter paths in /nix/store/lj04rld3qbxnkfpnskcs1dd2wdfwhin2-nixos-test-driver
/nix/store/lj04rld3qbxnkfpnskcs1dd2wdfwhin2-nixos-test-driver/bin/.nixos-test-driver-wrapped: interpreter directive changed from " /somewhere/perl -w" to "/nix/store/3qhzffjvl8gbiabikiqdnz4jhh9v84nz-perl-5.24.3/bin/perl -w"
checking for references to /build in /nix/store/lj04rld3qbxnkfpnskcs1dd2wdfwhin2-nixos-test-driver...
cannot build derivation '/nix/store/8pkx1sy7bb2nf1klsqvqnwc61kq3xxs6-nixos-test-driver-slim.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/fmmn1b9y8c83v3d92n9x2j0pj7j8vgwy-nixos-test-driver-systemd.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/qy7nrc2a10bhfmmdab63392p25dv8cwc-vm-test-run-slim.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/w28hzbnkf6jrqj85fm0zbc1rhfmzvkbs-vm-test-run-systemd.drv': 1 dependencies couldn't be built
�[31;1merror:�[0m build of '/nix/store/qy7nrc2a10bhfmmdab63392p25dv8cwc-vm-test-run-slim.drv', '/nix/store/w28hzbnkf6jrqj85fm0zbc1rhfmzvkbs-vm-test-run-systemd.drv' failed

@dtzWill
Machine.pm: tweak to look for graphical target in waitForX
0086036 
Current message may not be printed
(nothing in systemd contains that string,
 it comes from elsewhere)
@dtzWill dtzWill force-pushed the fix/nixos-machine-pm-tweak-waitForX branch from 224d157 to 0086036 Compare April 3, 2018 18:59
@dtzWill dtzWill requested review from aszlig and shlevy April 3, 2018 19:00
@dtzWill
Copy link
Member Author

dtzWill commented Apr 3, 2018

(using recent commit history for systemd to drive reviewer suggestions)

@dtzWill dtzWill merged commit 374d7cf into NixOS:staging Apr 4, 2018
@dtzWill dtzWill deleted the fix/nixos-machine-pm-tweak-waitForX branch April 4, 2018 02:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@shlevy shlevy

@aszlig aszlig

Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@dtzWill @GrahamcOfBorg @shlevy