Split --disable-tests, fix cross builds#9611
Merged
roberth merged 1 commit intoNixOS:masterfrom Dec 18, 2023
Merged
Conversation
Ericson2314
requested review from
edolstra and
fricklerhandwerk
as code owners
Merged
Ericson2314
force-pushed
the
fix-cross-configure
branch
from
629f528 to
c8233da
Compare
Contributor
fricklerhandwerk
left a comment
fricklerhandwerk
left a comment
There was a problem hiding this comment.
Looks about right, and seems to simplify the docs build logic, which I of course approve.
Please someone else review it properly.
edolstra
reviewed
Dec 14, 2023
Ericson2314
force-pushed
the
fix-cross-configure
branch
from
c8233da to
3660648
Compare
Ericson2314
added
the
idea approved
Member
Author
|
Discussed in Nix team meeting: Solution to "disable makefile" controversy is just inlining them to where they are used, the top-level |
Ericson2314
force-pushed
the
fix-cross-configure
branch
from
3660648 to
1933877
Compare
Ericson2314
force-pushed
the
fix-cross-configure
branch
from
1933877 to
9237fc8
Compare
It might seem obnoxious to have yet more configure flags, but I found
controlling both the unit and functional tests with one flag was quite
confusing because they are so different:
- unit tests depending on building, functional tests don't (e.g. when
we test already-built Nix)
- unit tests can be installed, functional tests cannot
- unit tests neeed extra libraries (GTest, RapidCheck), functional
tests need extra executables (jq).
- unit tests are run by `make check`, functional tests are run by `make
installcheck`
Really on a technical level, they seem wholly independent. Only on a
human level ("they are both are tests") do they have anything in common.
I had messed up the logic in cross builds because of this. Now I
split the flag in two (and cleaned up a few other inconsistencies), and
the logic fixed itself.
Co-Authored-By: Robert Hensing <roberth@users.noreply.github.com>
Ericson2314
force-pushed
the
fix-cross-configure
branch
from
9237fc8 to
7feabf7
Compare
roberth
approved these changes
Dec 18, 2023
Member
|
This fixed a CI failure (https://github.com/NixOS/nix/actions/runs/7204404968/job/19626137839, complaining about a failing @Ericson2314 can you take a look? |
Member
Author
|
#9646 Fixed here @thufschmitt . |
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
5 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.
Motivation
It might seem obnoxious to have yet more configure flags, but I found controlling both the unit and functional tests with one flag was quite confusing because they are so different:
unit tests depending on building, functional tests don't (e.g. when we test already-built Nix)
unit tests can be installed, functional tests cannot
unit tests neeed extra libraries (GTest, RapidCheck), functional tests need extra executables (jq).
unit tests are run by
make check, functional tests are run bymake installcheckReally on a technical level, they seem wholly independent. Only on a human level ("they are both are tests") do they have anything in common.
I had messed up the logic in cross builds because of this. Now I split the flag in two (and cleaned up a few other inconsistencies), and the logic fixed itself.
Context
I broke cross builds in #9535
Priorities
Add 👍 to pull requests you find important.