Skip to content

Commit d696739

Browse files
committed
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
2 parents d4c4e92 + cb542f9 commit d696739

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

ci/run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ if [ "$QEMU" != "" ]; then
7979
-net user \
8080
-nographic \
8181
-vga none 2>&1 | tee "${CARGO_TARGET_DIR}/out.log"
82-
exec egrep "^(PASSED)|(test result: ok)" "${CARGO_TARGET_DIR}/out.log"
82+
exec grep -E "^(PASSED)|(test result: ok)" "${CARGO_TARGET_DIR}/out.log"
8383
fi
8484

8585
if [ "$TARGET" = "s390x-unknown-linux-gnu" ]; then

ci/test-runner-linux

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ timeout 30s qemu-system-$arch \
2020
-append init=/run_prog.sh > output || true
2121

2222
# remove kernel messages
23-
tr -d '\r' < output | egrep -v '^\['
23+
tr -d '\r' < output | grep -Ev '^\['
2424

25-
egrep "(PASSED)|(test result: ok)" output > /dev/null
25+
grep -E "(PASSED)|(test result: ok)" output > /dev/null

0 commit comments

Comments
 (0)