From cb542f938709cdae114aa6c30437010cfbc8338b Mon Sep 17 00:00:00 2001 From: kxxt Date: Wed, 21 Sep 2022 19:19:09 +0800 Subject: [PATCH] refactor: use grep -E instead of egrep --- ci/run.sh | 2 +- ci/test-runner-linux | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/run.sh b/ci/run.sh index 3ef84d42ac0dc..4de8087699e24 100755 --- a/ci/run.sh +++ b/ci/run.sh @@ -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 cad31ec4c0100..3ce551944d888 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