Backed out changeset 24ddf11d9c1d (bug 1159999) for spidermonkey test failures on a CLOSED TREE

This commit is contained in:
Carsten "Tomcat" Book 2015-04-30 12:53:18 +02:00
parent 2b09933c8c
commit 21ab887ffd

View File

@ -1,9 +1,6 @@
#!/bin/bash
# Note that the -x will be temporarily cancelled and reinstated below, so if
# you want to eliminate this, you'll need to eliminate it there too.
set -x
set -e
set -x
DIR="$(dirname $0)"
ABSDIR="$(cd $DIR; pwd)"
@ -146,9 +143,7 @@ PARENT=$$
sh -c "sleep $TIMEOUT; kill -INT $PARENT" <&- >&- 2>&- &
KILLER=$!
disown %1
set +x
trap "echo 'TEST-UNEXPECTED-FAIL | autospider.sh $TIMEOUT timeout | ignore later failures' >&2; exit 1" INT
set -x
# If we do *not* hit that timeout, kill off the spawned process on a regular exit.
trap "kill $KILLER" EXIT