Commit 7049588bff21e3ea3e7bf3c4a4325c8ab4ed46f8
Committed by
Jay Berkenbilt
Jay Berkenbilt
1 parent
4dcc1021
Fix tests with GNU grep 3.8
GNU grep 3.8 started to emit warnings when invoking egrep. Convert all calls to grep -E.
Showing
5 changed files
with
6 additions
and
6 deletions
abi-perf-test
| @@ -3,7 +3,7 @@ set -eo pipefail | @@ -3,7 +3,7 @@ set -eo pipefail | ||
| 3 | cd $(dirname $0) | 3 | cd $(dirname $0) |
| 4 | whoami=$(basename $0) | 4 | whoami=$(basename $0) |
| 5 | 5 | ||
| 6 | -if [[ $(git status -s | egrep -v abi-perf-test | wc -l) != 0 ]]; then | 6 | +if [[ $(git status -s | grep -E -v abi-perf-test | wc -l) != 0 ]]; then |
| 7 | echo 1>&2 "${whoami}: git is not clean. (abi-perf-test changes ignored)" | 7 | echo 1>&2 "${whoami}: git is not clean. (abi-perf-test changes ignored)" |
| 8 | git status -s | 8 | git status -s |
| 9 | exit 2 | 9 | exit 2 |
build-scripts/build-doc
| @@ -10,7 +10,7 @@ pip3 install sphinx sphinx_rtd_theme | @@ -10,7 +10,7 @@ pip3 install sphinx sphinx_rtd_theme | ||
| 10 | cmake -S . -B build -DBUILD_DOC=1 | 10 | cmake -S . -B build -DBUILD_DOC=1 |
| 11 | cmake --build build --target doc_dist | 11 | cmake --build build --target doc_dist |
| 12 | zip -r doc.zip build/manual/doc-dist | 12 | zip -r doc.zip build/manual/doc-dist |
| 13 | -version=$(egrep '^release' manual/conf.py | cut -d"'" -f 2) | 13 | +version=$(grep -E '^release' manual/conf.py | cut -d"'" -f 2) |
| 14 | mv build/manual/doc-dist qpdf-${version}-doc | 14 | mv build/manual/doc-dist qpdf-${version}-doc |
| 15 | mkdir distribution | 15 | mkdir distribution |
| 16 | zip -r distribution/qpdf-${version}-doc-ci.zip qpdf-${version}-doc | 16 | zip -r distribution/qpdf-${version}-doc-ci.zip qpdf-${version}-doc |
build-scripts/build-fuzzer
| @@ -8,7 +8,7 @@ sudo apt-get -y install build-essential cmake zlib1g-dev libjpeg-dev | @@ -8,7 +8,7 @@ sudo apt-get -y install build-essential cmake zlib1g-dev libjpeg-dev | ||
| 8 | ./fuzz/oss-fuzz-build | 8 | ./fuzz/oss-fuzz-build |
| 9 | ls -l out/qpdf_fuzzer | 9 | ls -l out/qpdf_fuzzer |
| 10 | ls -l out/ | 10 | ls -l out/ |
| 11 | -if ldd out/qpdf_fuzzer | egrep 'libjpeg|libz|libqpdf'; then | 11 | +if ldd out/qpdf_fuzzer | grep -E 'libjpeg|libz|libqpdf'; then |
| 12 | echo 1>&2 "*** Fuzzers linked dynamically with some dependent libraries." | 12 | echo 1>&2 "*** Fuzzers linked dynamically with some dependent libraries." |
| 13 | ldd out/qpdf_fuzzer | 13 | ldd out/qpdf_fuzzer |
| 14 | exit 2 | 14 | exit 2 |
qpdf/qtest/qpdf/diff-encrypted
| 1 | #!/bin/sh | 1 | #!/bin/sh |
| 2 | -lines=$(expr 0 + $(diff "$1" "$2" | egrep '^[<>]' | egrep -v '(Date|InstanceID)' | wc -l)) | 2 | +lines=$(expr 0 + $(diff "$1" "$2" | grep -E '^[<>]' | grep -E -v '(Date|InstanceID)' | wc -l)) |
| 3 | if [ "$lines" = "0" ]; then | 3 | if [ "$lines" = "0" ]; then |
| 4 | echo okay | 4 | echo okay |
| 5 | else | 5 | else |
qpdf/qtest/qpdf/diff-ignore-ID-version
| 1 | #!/bin/sh | 1 | #!/bin/sh |
| 2 | -lines=$(expr 0 + $(diff "$1" "$2" | egrep '^[<>]' | \ | ||
| 3 | - egrep -v '/ID' | egrep -v '%PDF-' | wc -l)) | 2 | +lines=$(expr 0 + $(diff "$1" "$2" | grep -E '^[<>]' | \ |
| 3 | + grep -E -v '/ID' | grep -E -v '%PDF-' | wc -l)) | ||
| 4 | if [ "$lines" = "0" ]; then | 4 | if [ "$lines" = "0" ]; then |
| 5 | echo okay | 5 | echo okay |
| 6 | else | 6 | else |