Skip to content

Commit

Permalink
Auto merge of #2916 - kxxt:master, r=JohnTitor
Browse files Browse the repository at this point in the history
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
  • Loading branch information
bors committed Sep 21, 2022
2 parents d4c4e92 + cb542f9 commit d696739
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion ci/run.sh
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ci/test-runner-linux
Expand Up @@ -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

0 comments on commit d696739

Please sign in to comment.