stdenv: implement most of #33599 #39464
Merged
Conversation
This file contains 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
2 tasks
GrahamcOfBorg
added
6.topic: haskell
6.topic: python
6.topic: stdenv
|
Success on x86_64-linux (full log) Attempted: stdenv Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: stdenv Partial log (click to expand)
|
|
@GrahamcOfBorg build hello |
|
Success on aarch64-linux (full log) Attempted: hello Partial log (click to expand)
|
oxij
changed the title
checkTarget and installCheckTarget autodetectioncheckTarget and installCheckTarget autodetection
oxij
force-pushed
the
stdenv/docheck-infra
branch
from
d0148bb
to
488c023
Compare
oxij
changed the title
checkTarget and installCheckTarget autodetectioncheckTarget and installCheckTarget autodetection
oxij
force-pushed
the
stdenv/docheck-infra
branch
from
488c023
to
57f5653
Compare
oxij
force-pushed
the
stdenv/docheck-infra
branch
from
57f5653
to
324a476
Compare
|
Since #39463 got merged I pushed the rest of the infrastructure here. Feel free to play with this. |
oxij
changed the title
checkTarget and installCheckTarget autodetection
|
Do I understand correctly that for Python packages it unconditionally changes the default to true? |
|
Given «nobody» reads the afterglow of merged PRs: |
|
I generally like it, but will try to read it again. |
|
Failure on aarch64-linux (full log) Attempted: stdenv Partial log (click to expand)
|
Ekleog
requested changes
Apr 25, 2018
There was a problem hiding this comment.
Apart from the python default doCheck value change that doesn't depend on config.doCheckByDefault, I think this shouldn't break anything when config.doCheckByDefault is set to false, and that it's a good path forward. That said I don't know much about some parts of the code touched here, so… :)
| @@ -53,7 +53,7 @@ | |||
|
|
|||
| , passthru ? {} | |||
|
|
|||
| , doCheck ? false | |||
| , doCheck ? true | |||
There was a problem hiding this comment.
Isn't this a bit violent? The rest of the PR appears harmless, but wouldn't this set doCheck default to true regardless of config.doCheckByDefault?
| @@ -85,6 +84,7 @@ toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attrs [ | |||
| # Python packages don't have a checkPhase, only an installCheckPhase | |||
| doCheck = false; | |||
| doInstallCheck = doCheck; | |||
| installCheckInputs = checkInputs; | |||
There was a problem hiding this comment.
Couldn't this be wrapped in a lib.optionals?
There was a problem hiding this comment.
It could, but it doesn't matter, the mkDerivation takes care of it.
| @@ -36,6 +36,9 @@ rec { | |||
| , depsTargetTarget ? [] # 1 -> 1 | |||
| , depsTargetTargetPropagated ? [] # 1 -> 1 | |||
|
|
|||
| , checkInputs ? [] | |||
| , installCheckInputs ? [] | |||
|
|
|||
There was a problem hiding this comment.
Needs documentation in nixpkgs manual §3.5
| } // lib.optionalAttrs (outputs' != [ "out" ]) { | ||
| outputs = outputs'; | ||
| } // lib.optionalAttrs (attrs ? doCheck) { | ||
| # TODO(@Ericson2314): Make unconditional / resolve #33599 |
There was a problem hiding this comment.
I think you lost this TODO comment when moving this code upwards: I don't think with this PR #33599 would be solved yet? As it would require at least turning config.doCheckByDefault to default to true, which isn't coming until at least hydra has performed a world-rebuild with it and checked it failed no additional package, I guess.
| ${installCheckTarget:-installcheck} | ||
| ) | ||
| if [[ -z "${foundMakefile:-}" ]]; then | ||
| echo "no Makefile or custom buildPhase, doing nothing" |
There was a problem hiding this comment.
I guess you meant installCheckPhase here?
| ${checkTarget:-check} | ||
| ) | ||
| if [[ -z "${foundMakefile:-}" ]]; then | ||
| echo "no Makefile or custom buildPhase, doing nothing" |
There was a problem hiding this comment.
I guess you meant checkPhase here?
There was a problem hiding this comment.
This and the previous one. No. Custom buildPhase implies custom checkPhase (or else it will run no tests): since you don't use make to build, this can't use make to test (in general).
oxij
force-pushed
the
stdenv/docheck-infra
branch
from
9ee061a
to
03a55ff
Compare
Note that a bunch of non-python packages use this attribute already. Some of those are clearly unaware of the fact that this attribute does not exists in stdenv because they define it but don't to add it to their `bulidInputs` :) Also note that I use `buildInputs` here and only handle regular builds because python and haskell builders do it this way and I'm not sure how to properly handle the cross-compilation case.
oxij
force-pushed
the
stdenv/docheck-infra
branch
from
03a55ff
to
87651b3
Compare
oxij
changed the title
|
Rebase done. |
|
Success on aarch64-linux (full log) Attempted: stdenv Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Attempted: stdenv Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Attempted: stdenv Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Attempted: stdenv Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Attempted: stdenv Partial log (click to expand)
|
|
Heh. I think we just witnessed a bug in This then suggests a way to force @GrahamcOfBorg to make long rebuilds multiple times: you can push several dependent changes one-by-one and all but the very first one would hang waiting for lock, but then the first one timeouts the next one immediately picks up where the previous one left and extends the timeout. /cc @grahamc |
matthewbauer
approved these changes
Apr 27, 2018
|
I think this should be merged and doCheckByDefault set by default ASAP, look what bugs it can find: #28029 (comment)
|
|
ping!
|
This was referenced Jul 16, 2018
Merged
This was referenced Aug 5, 2018
This was referenced Sep 5, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Motivation for this change
#33599. This PR implements the main feature needed to implement #33599:
checkTargetautodetection.Set
config.doCheckByDefault = trueand behold how many failed tests there are. I will PR a huge bunch of fixes for those bugs later (after I rebuild everything myself on top of this version), see #39463 and linked PRs.Things done