Mercurial > hg
comparison tests/test-subrepo-deep-nested-change.t @ 50725: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 |
comparison
equal
deleted
inserted
replaced
| 50724:a10d823a8e3d | 50725:7e5be4a7cda7 |
|---|---|
| 394 \r (no-eol) (esc) | 394 \r (no-eol) (esc) |
| 395 archiving (sub1/sub2) [ ] 0/2\r (no-eol) (esc) | 395 archiving (sub1/sub2) [ ] 0/2\r (no-eol) (esc) |
| 396 archiving (sub1/sub2) [==============> ] 1/2\r (no-eol) (esc) | 396 archiving (sub1/sub2) [==============> ] 1/2\r (no-eol) (esc) |
| 397 archiving (sub1/sub2) [==============================>] 2/2\r (no-eol) (esc) | 397 archiving (sub1/sub2) [==============================>] 2/2\r (no-eol) (esc) |
| 398 \r (no-eol) (esc) | 398 \r (no-eol) (esc) |
| 399 $ diff -r . ../wdir | egrep -v '\.hg$|^Common subdirectories:' | 399 $ diff -r . ../wdir | grep -E -v '\.hg$|^Common subdirectories:' |
| 400 Only in ../wdir: .hg_archival.txt | 400 Only in ../wdir: .hg_archival.txt |
| 401 | 401 |
| 402 $ find ../wdir -type f | sort | 402 $ find ../wdir -type f | sort |
| 403 ../wdir/.hg_archival.txt | 403 ../wdir/.hg_archival.txt |
| 404 ../wdir/.hgsub | 404 ../wdir/.hgsub |
| 813 ? sub1/sub2/untracked.txt | 813 ? sub1/sub2/untracked.txt |
| 814 ? sub1/sub2/x.txt | 814 ? sub1/sub2/x.txt |
| 815 $ hg add sub1/sub2 | 815 $ hg add sub1/sub2 |
| 816 | 816 |
| 817 $ hg archive -S -r 'wdir()' ../wdir2 | 817 $ hg archive -S -r 'wdir()' ../wdir2 |
| 818 $ diff -r . ../wdir2 | egrep -v '\.hg$|^Common subdirectories:' | 818 $ diff -r . ../wdir2 | grep -E -v '\.hg$|^Common subdirectories:' |
| 819 Only in ../wdir2: .hg_archival.txt | 819 Only in ../wdir2: .hg_archival.txt |
| 820 Only in .: .hglf | 820 Only in .: .hglf |
| 821 Only in .: foo | 821 Only in .: foo |
| 822 Only in ./sub1/sub2: large.bin | 822 Only in ./sub1/sub2: large.bin |
| 823 Only in ./sub1/sub2: test.txt | 823 Only in ./sub1/sub2: test.txt |
| 852 Test 'wdir()' modified file archiving with largefiles | 852 Test 'wdir()' modified file archiving with largefiles |
| 853 $ echo 'mod' > main | 853 $ echo 'mod' > main |
| 854 $ echo 'mod' > large.bin | 854 $ echo 'mod' > large.bin |
| 855 $ echo 'mod' > sub1/sub2/large.dat | 855 $ echo 'mod' > sub1/sub2/large.dat |
| 856 $ hg archive -S -r 'wdir()' ../wdir3 | 856 $ hg archive -S -r 'wdir()' ../wdir3 |
| 857 $ diff -r . ../wdir3 | egrep -v '\.hg$|^Common subdirectories' | 857 $ diff -r . ../wdir3 | grep -E -v '\.hg$|^Common subdirectories' |
| 858 Only in ../wdir3: .hg_archival.txt | 858 Only in ../wdir3: .hg_archival.txt |
| 859 Only in .: .hglf | 859 Only in .: .hglf |
| 860 Only in .: foo | 860 Only in .: foo |
| 861 Only in ./sub1/sub2: large.bin | 861 Only in ./sub1/sub2: large.bin |
| 862 Only in ./sub1/sub2: test.txt | 862 Only in ./sub1/sub2: test.txt |