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

Update line numbers in .good for #24136 #24157

Merged
merged 1 commit into from
Jan 6, 2024

Conversation

vasslitvinov
Copy link
Member

This PR updates .good files with line numbers that changed due to #24136.

Could we instead prediff-out these line numbers?

Yes, by copying from one of multiple existing prediff scripts (possibly using a more specific path) that contain this:

!/usr/bin/env bash
# Ignore line numbers in modules.

sed '\|CHPL_HOME/modules|s/:[0-9]*:/:nnnn:/' $2 > $2.tmp
mv $2.tmp $2

SHOULD we prediff-out the these line numbers?

Citing Engin, "this is one of those cases where it is not as clear to me: this is a memory diagnostic test, and it is kind of important to see which line numbers are producing the message." So I choose to retain the (very mild) maintenance burden of keeping the explicit line numbers in order to provide more robust testing.

For a general background, we apply the above prediff conversion in 50+ .prediff and PREDIFF scripts. Furthermore we convert such line numbers automatically when comparing against .bad files, see diff-ignoring-module-line-numbers. We may want to make this conversion automatic for .good files as well, which I am leaving outside the scope of this PR.

Signed-off-by: Vassily Litvinov <vasslitvinov@users.noreply.github.com>
@vasslitvinov vasslitvinov merged commit 9e4b99b into chapel-lang:main Jan 6, 2024
7 checks passed
@vasslitvinov vasslitvinov deleted the fix-failure-linenum branch January 6, 2024 01:37
vasslitvinov added a commit that referenced this pull request Jan 18, 2024
This PR reacts to #24127 analogously to #24157, following the same argument
in favor of changing the line numbers vs. introducing a prediff.

Additionally, it reflects a reduction in the allocation/freeing size of
`[domain(1,int(64),one)] int(64)` from 168 to 160 bytes.
I did not investigate where that comes from.

reviewed, although favored the prediff solution: @mppf
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

2 participants