gpgme: respect the doCheck parameter #187061
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
The current `gpgme` expression ignores the `doCheck` parameter because upstream's `Makefile` runs the tests automatically as part of the `buildPhase`. Let's run the tests as part of the `checkPhase` iff `doCheck` is set, like the rest of nixpkgs' packages. In particular, with this commit, `pkgsCross.*.gpgme` will no longer attempt to run the tests (tests are not supposed to be run when host!=build).
dotlambda
reviewed
Aug 17, 2022
| # which has a path length limit. Nix on darwin is using a build directory | ||
| # that already has quite a long path and the resulting socket path doesn't | ||
| # fit in the limit. https://github.com/NixOS/nix/pull/1085 | ||
| doCheck = !stdenv.isDarwin; |
There was a problem hiding this comment.
--disable-gpg-test is not sufficient anymore?
There was a problem hiding this comment.
That does not seem to disable all of the tests; just some of them:
$ ./configure --help | grep test
--cache-file=FILE cache test results in FILE [disabled]
--disable-glibtest do not try to compile and run a test GLIB program
--disable-gpgconf-test disable GPGCONF regression test
--disable-gpg-test disable GPG regression test
--disable-gpgsm-test disable GPGSM regression test
--disable-g13-test disable G13 regression test
There was a problem hiding this comment.
Ah, but the other tests should remain enabled on Darwin. I see. Fixed in 1519ec7.
ghost
requested a review
from 
ofborg
bot
added
10.rebuild-darwin: 101-500
and removed
10.rebuild-darwin: 11-100
labels
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.
Description of changes
The current
gpgmeexpression ignores thedoCheckparameter because upstream'sMakefileruns the tests automatically as part of thebuildPhase. Let's run the tests as part of thecheckPhaseiffdoCheckis set, like the rest of nixpkgs' packages.In particular, with this commit,
pkgsCross.*.gpgmewill no longer attempt to run the tests (tests are not supposed to be run when host!=build).CC @dotlambda -- if there is a better way than setting
tests=""to exert control over whether or not the tests are run automatically please let me know. I didn't see one but I could have missed it.Things done
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)