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.

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

Fix the coverage job #7686

Merged
merged 1 commit into from
Jan 25, 2023
Merged

Fix the coverage job #7686

merged 1 commit into from
Jan 25, 2023

Conversation

Ericson2314
Copy link
Member

@Ericson2314 Ericson2314 commented Jan 25, 2023

Motivation

See https://hydra.nixos.org/build/206790960

Context

More motivation for #6538 and #7674 to help us avoid regressions like these in the future.

Checklist for maintainers

Maintainers: tick if completed or explain if not relevant

  • agreed on idea
  • agreed on implementation strategy
  • tests, as appropriate
    • functional tests - tests/**.sh
    • unit tests - src/*/tests
    • integration tests
  • documentation in the manual
  • code and comments are self-explanatory
  • commit message explains why the change was made
  • new feature or bug fix: updated release notes

@Ericson2314 Ericson2314 added the backport 2.13-maintenance Automatically creates a PR against the branch label Jan 25, 2023
@@ -465,6 +465,10 @@

src = self;

configureFlags = [
"CXXFLAGS=-I${lib.getDev pkgs.rapidcheck}/extras/gtest/include"
Copy link
Member

Choose a reason for hiding this comment

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

Why do we pass this as a configure flag? Why not NIX_CFLAGS_COMPILE?

Copy link
Member Author

Choose a reason for hiding this comment

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

@edolstra It could work either way, but I think this is a bit nicer because it documents how one would do things without a cc-wrapper on other platforms.

I generally think of the cc-wrapper vars a last sort, and it being better to leverage a project's build system than sneak behind its back.

I opened emil-e/rapidcheck#302 in hope that rapidcheck would be OK with having a pkg-config file, and then all this can just go away.

@Ericson2314 Ericson2314 removed the backport 2.13-maintenance Automatically creates a PR against the branch label Jan 25, 2023
@Ericson2314
Copy link
Member Author

Removed backport label because with #7687 2.13 no longer depends on rapidcheck.

@Ericson2314 Ericson2314 reopened this Jan 25, 2023
@edolstra edolstra merged commit 33263ee into NixOS:master Jan 25, 2023
@Ericson2314 Ericson2314 deleted the fix-coverage branch January 25, 2023 21:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants