Mercurial > public > mercurial-scm > hg
diff tests/test-subrepo-deep-nested-change.t @ 50722:7e5be4a7cda7 stable
tests: use grep -E instead of obsolescent egrep
Testing on Fedora 38 failed with:
egrep: warning: egrep is obsolescent; using grep -E
The warning comes from
https://git.savannah.gnu.org/cgit/grep.git/commit/?id=a9515624709865d480e3142fd959bccd1c9372d1
. For further anecdotal evidence of the change, see
https://www.phoronix.com/news/GNU-Grep-3.8-Stop-egrep-fgrep .
This reverses the code check that goes back to e7d3b509af8b. grep -E is POSIX,
but there is a risk that it doesn't work the same on all platforms - especially
older Unix versions. It should however always be possible to put a GNU grep in
$PATH before running the tests.
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Mon, 26 Jun 2023 14:34:58 +0200 |
| parents | 68b7faeb6ef3 |
| children | dcaa2df1f688 |
line wrap: on
line diff
--- a/tests/test-subrepo-deep-nested-change.t Mon Jun 26 11:15:30 2023 +0100 +++ b/tests/test-subrepo-deep-nested-change.t Mon Jun 26 14:34:58 2023 +0200 @@ -396,7 +396,7 @@ archiving (sub1/sub2) [==============> ] 1/2\r (no-eol) (esc) archiving (sub1/sub2) [==============================>] 2/2\r (no-eol) (esc) \r (no-eol) (esc) - $ diff -r . ../wdir | egrep -v '\.hg$|^Common subdirectories:' + $ diff -r . ../wdir | grep -E -v '\.hg$|^Common subdirectories:' Only in ../wdir: .hg_archival.txt $ find ../wdir -type f | sort @@ -815,7 +815,7 @@ $ hg add sub1/sub2 $ hg archive -S -r 'wdir()' ../wdir2 - $ diff -r . ../wdir2 | egrep -v '\.hg$|^Common subdirectories:' + $ diff -r . ../wdir2 | grep -E -v '\.hg$|^Common subdirectories:' Only in ../wdir2: .hg_archival.txt Only in .: .hglf Only in .: foo @@ -854,7 +854,7 @@ $ echo 'mod' > large.bin $ echo 'mod' > sub1/sub2/large.dat $ hg archive -S -r 'wdir()' ../wdir3 - $ diff -r . ../wdir3 | egrep -v '\.hg$|^Common subdirectories' + $ diff -r . ../wdir3 | grep -E -v '\.hg$|^Common subdirectories' Only in ../wdir3: .hg_archival.txt Only in .: .hglf Only in .: foo