diff options
| author | bors <bors@rust-lang.org> | 2022-09-21 11:38:54 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-09-21 11:38:54 +0000 |
| commit | d69673910aafdd2dfb83707f3bf895230415599c (patch) | |
| tree | 14b53010dbdb64cdd41850410e45dced64e3df6e | |
| parent | d4c4e9214b9e86cdbf68b7f6ca3f064ec148f2e5 (diff) | |
| parent | cb542f938709cdae114aa6c30437010cfbc8338b (diff) | |
| download | rust-libc-d69673910aafdd2dfb83707f3bf895230415599c.tar.gz | |
Auto merge of #2916 - kxxt:master, r=JohnTitor
refactor: use grep -E instead of egrep
`egrep` and `fgrep` are obsolescent now. This PR updates all `egrep` and `fgrep` commands to `grep -E` and `grep -F`.
Running egrep/fgrep command with grep v3.8 will output the following warning to stderr:
```
egrep: warning: egrep is obsolescent; using grep -E
```
see also:
- https://www.phoronix.com/news/GNU-Grep-3.8-Stop-egrep-fgrep
- https://lists.gnu.org/archive/html/info-gnu/2022-09/msg00001.html
| -rwxr-xr-x | ci/run.sh | 2 | ||||
| -rwxr-xr-x | ci/test-runner-linux | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -79,7 +79,7 @@ if [ "$QEMU" != "" ]; then -net user \ -nographic \ -vga none 2>&1 | tee "${CARGO_TARGET_DIR}/out.log" - exec egrep "^(PASSED)|(test result: ok)" "${CARGO_TARGET_DIR}/out.log" + exec grep -E "^(PASSED)|(test result: ok)" "${CARGO_TARGET_DIR}/out.log" fi if [ "$TARGET" = "s390x-unknown-linux-gnu" ]; then diff --git a/ci/test-runner-linux b/ci/test-runner-linux index cad31ec4c0..3ce551944d 100755 --- a/ci/test-runner-linux +++ b/ci/test-runner-linux @@ -20,6 +20,6 @@ timeout 30s qemu-system-$arch \ -append init=/run_prog.sh > output || true # remove kernel messages -tr -d '\r' < output | egrep -v '^\[' +tr -d '\r' < output | grep -Ev '^\[' -egrep "(PASSED)|(test result: ok)" output > /dev/null +grep -E "(PASSED)|(test result: ok)" output > /dev/null |