Mercurial > public > mercurial-scm > hg
diff tests/test-archive.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 | 0583d7f0fdff |
| children | 72bcc41f5c3b |
line wrap: on
line diff
--- a/tests/test-archive.t Mon Jun 26 11:15:30 2023 +0100 +++ b/tests/test-archive.t Mon Jun 26 14:34:58 2023 +0200 @@ -51,12 +51,12 @@ $ hg -R clone1 update -C tip cloning subrepo subrepo from $TESTTMP/test/subrepo 3 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ find share2 | egrep 'sharedpath|00.+\.i' | sort + $ find share2 | grep -E 'sharedpath|00.+\.i' | sort share2/.hg/sharedpath share2/subrepo/.hg/sharedpath $ hg -R share2 unshare unsharing subrepo 'subrepo' - $ find share2 | egrep 'sharedpath|00.+\.i' | sort + $ find share2 | grep -E 'sharedpath|00.+\.i' | sort share2/.hg/00changelog.i share2/.hg/sharedpath.old share2/.hg/store/00changelog.i @@ -566,7 +566,7 @@ $ hg add old $ hg commit -m old $ hg archive ../old.zip - $ unzip -l ../old.zip | grep -v -- ----- | egrep -v files$ + $ unzip -l ../old.zip | grep -v -- ----- | grep -E -v files$ Archive: ../old.zip \s*Length.* (re) *172*80*00:00*old/.hg_archival.txt (glob)