buildLinux: structuralize passthru.tests and kernelTests#287659
Closed
ShamrockLee wants to merge 2 commits intoNixOS:masterfrom
Closed
buildLinux: structuralize passthru.tests and kernelTests#287659ShamrockLee wants to merge 2 commits intoNixOS:masterfrom
ShamrockLee wants to merge 2 commits intoNixOS:masterfrom
Conversation
github-actions
bot
added
6.topic: nixos
ofborg
bot
added
10.rebuild-darwin: 0
13 tasks
Contributor
Author
|
@ofborg build linux linux.tests |
ShamrockLee
force-pushed
the
linux-kernel-passthru-tests
branch
from
45c9ac3 to
243904a
Compare
wegank
added
the
2.status: merge conflict
ShamrockLee
force-pushed
the
linux-kernel-passthru-tests
branch
from
243904a to
d86b534
Compare
ofborg
bot
removed
the
2.status: merge conflict
Contributor
Author
|
Bump onto master and resolve merge conflict. |
wegank
added
the
2.status: merge conflict
Override `finalAttrs.finalPackage` instead of `kernel` from the let-in block to make configEnv behave in accordance with overrideAttrs of the result package. Continuation of commit f10331c ("buildLinux: passthru by <pkg>.overrideAttrs instead of lib.extendDerivation")
Present passthru.tests of the result package as an attribute set instead of a list. Recommend adding tests by overriding `passthru.tests` with `overrideAttrs`. Make the input argument kernelTests accept an attribute set instead of a list. Handle the previous override interface of kerneTests as a list with a warning message and transform the elements into an attribute set in the form `passthru.tests.extra-kernel-test-<0-based index>`.
ShamrockLee
force-pushed
the
linux-kernel-passthru-tests
branch
from
d86b534 to
5070af6
Compare
Contributor
Author
|
I rebased the changes and resolved merge conflicts. @roberth, I restructured the two test cases as version-does-not-dependent-on-patches-etc-nixos and version-does-not-dependent-on-patches-etc. I excluded the former by commenting it out and prefixing it with a wall of number signs ( |
ofborg
bot
removed
the
2.status: merge conflict
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: |
wegank
added
the
2.status: merge conflict
Contributor
Author
|
#350008 surpassed this PR. I'll open a new, backportable PR to improve the overriding of |
Contributor
Author
|
Update: The new PR is #364679. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of changes
Currently, both the
kernelTestsinput argument ofbuildLinuxand thepassthru.testsattribute of the result kernel package are lists. This PR brings the structural,passthru.tests.<name>attribute set pattern tobuildLinux. This includes:Presenting passthru.tests of the result package as an attribute set instead of a list.
Making the input argument kernelTests accept an attribute set instead of a list.
Handling the previous override interface of kerneTests as a list with a warning message and transform the elements into an attribute set in the form
passthru.tests.extra-kernel-test-<0-based index>.If applied, one will be able to run a specific test case intuitively, without having to go through complex
--exprspecification.Things done
nixos-install-tools)nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.