Bug 1159999 - Suppress command echo for timeout failure setup. r=sphink
authorSteve Fink <sfink@mozilla.com>
Thu, 30 Apr 2015 09:38:57 -0400
changeset 271631 09389263844ef18449f805c3b90f6ccfeab738a0
parent 271630 e6d14970cb2b1adf3fe3cadf0be712ba4b38be7b
child 271632 9aa2214155ab661e4f68bcd493c9b23ccd32536f
push id4830
push userjlund@mozilla.com
push dateMon, 29 Jun 2015 20:18:48 +0000
treeherdermozilla-beta@4c2175bb0420 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssphink
bugs1159999
milestone40.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1159999 - Suppress command echo for timeout failure setup. r=sphink
js/src/devtools/automation/autospider.sh
--- a/js/src/devtools/automation/autospider.sh
+++ b/js/src/devtools/automation/autospider.sh
@@ -1,11 +1,14 @@
 #!/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)"
 SOURCE="$(cd $DIR/../../../..; pwd)"
 
 function usage() {
   echo "Usage: $0 [--dep] <variant>"
 }
@@ -138,17 +141,19 @@ RUN_JSTESTS=true
 
 PARENT=$$
 
 # Spawn off a child process, detached from any of our fds, that will kill us after a timeout.
 # To report the timeout, catch the signal in the parent before exiting.
 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
 
 if [[ "$VARIANT" = "rootanalysis" ]]; then
     export JS_GC_ZEAL=7
 
 elif [[ "$VARIANT" = "compacting" ]]; then