Use absolute paths for unsaved files passed to clang and prepend -inc… #1857
Conversation
…lude directives to them. Fixes #1771
| assert_eq!(expected, actual); | ||
| } | ||
|
|
||
|
|
There was a problem hiding this comment.
You need to remove this stray newline for CI to pass.
|
|
||
| let expected = include_str!(concat!( | ||
| env!("CARGO_MANIFEST_DIR"), | ||
| "/tests/expectations/tests/test_mixed_header_and_header_contents.rs" |
There was a problem hiding this comment.
Hmm, how do you update this file when output changes? Do you need to do that manually? If so, it's a bit unfortunate.
There was a problem hiding this comment.
Hey, thanks for review :) And could you elaborate on this issue, please? I'm not sure what are the other ways to update the expectation but to do it manually, unfortunately. E.g., in test_multiple_header_calls_in_builder the pattern is the same, if I got it right.
There was a problem hiding this comment.
Yeah, you're right that this pattern is not new, it's just worse having tests you need to manually update, because the overhead of updating them scales with the amount of tests :(
I guess we can take this as-is though.
There was a problem hiding this comment.
Actually, now that I think about it - I can use two existing test expectation files and try to concatenate them with inline expectation from header_contents calls, so that I will not introduce new expectation files.
There was a problem hiding this comment.
That sounds great. as long as the first header doesn't have any anonymous enum or struct it should work.
|
☔ The latest upstream changes (presumably 5177889) made this pull request unmergeable. Please resolve the merge conflicts. |
|
Very smart, bors. |
…lude directives to them. Fixes rust-lang#1771 Closes rust-lang#1857
…lude directives to them.
Fixes #1771