AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tools/pdf-comparison.sh: stop relying on /usr/bin/timeout

Browse Source 
NOTRY=true
TBR=

Review URL: https://codereview.chromium.org/1921943006
This commit is contained in:
halcanary 2016-04-27 07:44:03 -07:00 committed by Commit bot
parent 6f47dbaff5
commit d155607171
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tools/pdf-comparison.sh
View File

@ -19,7 +19,7 @@ if ! [ "$1" ] || ! [ "$2" ]; then
fi
BAD=''
for CMD in 'python' 'ninja' 'pdfium_test' 'timeout' 'skdiff'; do
for CMD in 'python' 'ninja' 'pdfium_test' 'skdiff'; do
if ! command -v "$CMD" > /dev/null ; then
echo "could not find $CMD command in PATH." >&2
BAD=1
@ -69,10 +69,25 @@ if [ -z "$DIFFS" ]; then
exit 0;
fi
# Portable version of timeout from GNU coreutils.
timeout_py() { python -c "$(cat <<EOF
import sys, subprocess, threading
proc = subprocess.Popen(sys.argv[2:])
timer = threading.Timer(float(sys.argv[1]), proc.terminate)
timer.start()
proc.wait()
timer.cancel()
exit(proc.returncode)
EOF
)" "$@"; }
# rasterize the remaining PDFs
for pdf in "$CON_DIR"/*pdf "$EXP_DIR"/*pdf ; do
# timeout is from GNU coreutils
if timeout 10 pdfium_test --png "$pdf"; then
if timeout_py 10 pdfium_test --png "$pdf"; then
if ! [ -f "$pdf".*.png ] ; then
echo "Missing pdfium_test output: '$pdf.*.png'" >&2
exit 1
fi
rm "$pdf"
else
echo "pdfium_test '$pdf' failed."