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

Add a prediff to fix .good mismatch #19322

Merged
merged 1 commit into from Feb 27, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions test/deprecated/regexp-rechan.good
@@ -1,17 +1,17 @@
regexp-rechan.chpl:16: warning: `channel.match(re:regex(?))` is deprecated
$CHPL_HOME/modules/standard/IO.chpl:7130: In method 'match':
$CHPL_HOME/modules/standard/IO.chpl:7134: warning: `channel.match(re:regex(?), ref error:syserr)` is deprecated
$CHPL_HOME/modules/standard/IO.chpl:nnnn: In method 'match':
$CHPL_HOME/modules/standard/IO.chpl:nnnn: warning: `channel.match(re:regex(?), ref error:syserr)` is deprecated
regexp-rechan.chpl:16: called as (channel(false,dynamic,true)).match(re: regex(string))
regexp-rechan.chpl:27: warning: `channel.match(re:regex(?))` is deprecated
regexp-rechan.chpl:39: warning: `channel.match(re:regex(?), ref captures ...?k)` is deprecated
$CHPL_HOME/modules/standard/IO.chpl:7196: In method 'match':
$CHPL_HOME/modules/standard/IO.chpl:7200: warning: `channel.match(re:regex(?), ref captures ...?k, ref error:syserr)` is deprecated
$CHPL_HOME/modules/standard/IO.chpl:nnnn: In method 'match':
$CHPL_HOME/modules/standard/IO.chpl:nnnn: warning: `channel.match(re:regex(?), ref captures ...?k, ref error:syserr)` is deprecated
regexp-rechan.chpl:39: called as (channel(false,dynamic,true)).match(re: regex(string), captures(0): string)
regexp-rechan.chpl:52: warning: `channel.match(re:regex(?), ref captures ...?k)` is deprecated
regexp-rechan.chpl:65: warning: `channel.match(re:regex(?), ref captures ...?k)` is deprecated
regexp-rechan.chpl:78: warning: `channel.match(re:regex(?), ref captures ...?k)` is deprecated
$CHPL_HOME/modules/standard/IO.chpl:7023: In method 'search':
$CHPL_HOME/modules/standard/IO.chpl:7026: warning: `channel.search(re:regex(?), ref error:syserr)` is deprecated
$CHPL_HOME/modules/standard/IO.chpl:nnnn: In method 'search':
$CHPL_HOME/modules/standard/IO.chpl:nnnn: warning: `channel.search(re:regex(?), ref error:syserr)` is deprecated
regexp-rechan.chpl:93: called as (channel(false,dynamic,true)).search(re: regex(string))
Words words words
+match: One word no captures
Expand Down
9 changes: 9 additions & 0 deletions test/deprecated/regexp-rechan.prediff
@@ -0,0 +1,9 @@
#!/usr/bin/env bash
# Ignore line numbers in modules.

# This is derived from test/library/packages/Sort/errors/PREDIFF
# There and in many other prediffs, the match pattern is /:[0-9:]*:/
# Here we drop : inside [] because it is not needed.

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