Make functional tests depend on nix binary so they auto recompile#13683
Make functional tests depend on nix binary so they auto recompile#13683xokdvium merged 1 commit intoNixOS:masterfrom
Conversation
|
@xokdvium ask and you shall receive. |
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as resolved.
This comment was marked as resolved.
|
This works for me locally... not sure about this |
5ff41ee to
b4cd2cf
Compare
|
The meson setup is pretty convoluted. Folks on #mesonbuild didn't give me much in the way of advice. |
|
It's supposed to already do this with the existing "find program", IIRC. If it's not working, a bug should be submitted to Meson. |
|
You also don't want to change the main suite, you want to change the loop at the bottom to include |
|
It does not work for me @Ericson2314 -- just change any source line and run I couldn't find documentation claiming that |
|
@fzakaria so to be clear, my first comment is maybe not quite right, I think the diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index 8f2b1ff59a..4a7dfae5d5 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -249,7 +249,7 @@ foreach suite : suites
# them more time than the default of 30 seconds.
timeout : 300,
# Used for target dependency/ordering tracking, not adding compiler flags or anything.
- depends : suite['deps'],
+ depends : [nix] + suite['deps'],
workdir : workdir,
)
endforeach(what my second comment proposes), then it should work. If it still doesn't work, then I think that is a Meson bug. |
|
@Ericson2314 the build was failing with |
|
ah ok @fzakaria. Then yes it might be a feature request, but it should still be a Meson issue:
|
|
I'll just open the issue :) |
|
mesonbuild/meson#14874 OK there is the issue |
With this I'm able to do a fresh config + meson test with all dependencies correctly propagated. Co-authored-by: Sergei Zimmerman <sergei@zimmerman.foo>
b4cd2cf to
bf32046
Compare
|
@fzakaria, @Ericson2314 this should now work perfectly locally as well as in CI. Also needed some fixes for perl dependency tracking. |
Trivial improvement to Meson.
I noticed plenty of tests don't depend on
nixitself which is frustrating since I forget to domeson compile.Slowly making the build graph more "correct".
I'm not an expert in Meson so not sure if this is ultimately correct but it does what I expect.
Add 👍 to pull requests you find important.
The Nix maintainer team uses a GitHub project board to schedule and track reviews.