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.

Sign up for GitHub

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

Jump to bottom

Allow custom targets in extract_objects and test #9400

Merged
merged 4 commits into from
Dec 6, 2021
Merged

Allow custom targets in extract_objects and test #9400

merged 4 commits into from
Dec 6, 2021

Conversation

bonzini
Copy link
Contributor

@bonzini bonzini commented Oct 14, 2021 •
edited by eli-schwartz
Loading

This fixes two pending issues related to custom targets, allowing them to be used in extract_objects and in test.

Fixes #7585
Fixes #8333

@codecov
Copy link

codecov bot commented Oct 14, 2021 •
edited
Loading

Codecov Report

Merging #9400 (0bf3f92) into master (bea735d) will decrease coverage by 2.85%.
The diff coverage is n/a.

❗ Current head 0bf3f92 differs from pull request most recent head b6a8c9b. Consider uploading reports for the commit b6a8c9b to get more accurate results
Impacted file tree graph

@@            Coverage Diff             @@
##           master    #9400      +/-   ##
==========================================
- Coverage   67.17%   64.32%   -2.86%     
==========================================
  Files         402      200     -202     
  Lines       85564    42642   -42922     
  Branches    18916     8700   -10216     
==========================================
- Hits        57479    27429   -30050     
+ Misses      23516    12957   -10559     
+ Partials     4569     2256    -2313
Impacted Files Coverage Δ
modules/keyval.py 90.24% <0.00%> (-5.00%) ⬇️
dependencies/dev.py 57.98% <0.00%> (-2.32%) ⬇️
mlog.py 83.26% <0.00%> (-1.17%) ⬇️
interpreter/interpreter.py 81.47% <0.00%> (-0.91%) ⬇️
interpreter/type_checking.py 62.80% <0.00%> (-0.61%) ⬇️
mesonlib/universal.py 75.46% <0.00%> (-0.17%) ⬇️
interpreter/compiler.py 93.61% <0.00%> (-0.05%) ⬇️
interpreterbase/decorators.py 90.86% <0.00%> (-0.03%) ⬇️
interpreter/interpreterobjects.py 84.91% <0.00%> (-0.03%) ⬇️
build.py 73.25% <0.00%> (-0.01%) ⬇️
... and 222 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update bea735d...b6a8c9b. Read the comment docs.

@eli-schwartz eli-schwartz linked an issue Oct 19, 2021 that may be closed by this pull request
Can't extract objects form custom_target() #8333
Closed
@bonzini bonzini marked this pull request as ready for review October 19, 2021 06:39
dcbaker
dcbaker approved these changes Nov 12, 2021
View reviewed changes
Copy link
Member

@dcbaker dcbaker left a comment

Choose a reason for hiding this comment

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

Your code all looks good. I did notice a separate bug looking at your code. Would you like me to patch that separately, or would you like to patch it?

mesonbuild/interpreter/interpreter.py Outdated Show resolved Hide resolved
@bonzini bonzini mentioned this pull request Nov 14, 2021
Merged
@bonzini bonzini force-pushed the fix-7585 branch 3 times, most recently from 1ab2e77 to 4f8b59a Compare November 17, 2021 14:57
@bonzini
Copy link
Contributor Author

bonzini commented Nov 21, 2021

Ping @jpakkane, the failures seem extraneous.

@bonzini bonzini force-pushed the fix-7585 branch 2 times, most recently from 85e1466 to f6bf9fa Compare November 24, 2021 10:24
@bonzini
pass all outputs of a custom_target as arguments to a test
d1ad491 
Meson was passing only the first output and warning about it.  To do this
easily, refactor construct_target_rel_path to return a list.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
@bonzini
allow passing a CustomTargetIndex as argument to a test
eb5fbbb 
Fixes: mesonbuild#7585
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
@bonzini
interpreter: allow extract_objects to receive generated sources
6c32f1d 
Fixes: mesonbuild#8333
@bonzini
interpreter: use build.GeneratedTypes
b6a8c9b 
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
@bonzini
Copy link
Contributor Author

bonzini commented Nov 29, 2021

Conflicts fixed and CI is green, hint hint :)

@nirbheek nirbheek modified the milestones: 0.60.3, 0.61.0 Dec 2, 2021
@dcbaker dcbaker merged commit 10329a1 into mesonbuild:master Dec 6, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dcbaker dcbaker dcbaker approved these changes

@jpakkane jpakkane Awaiting requested review from jpakkane jpakkane is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
0.61.0
Development

Successfully merging this pull request may close these issues.

Can't extract objects form custom_target() test doesn't take custom_target index objects
3 participants
@bonzini @dcbaker @nirbheek