Bug 1159999 - Suppress command echo for timeout failure setup. r=sphink
☠☠ backed out by ef0857b200ae ☠ ☠
authorSteve Fink <sfink@mozilla.com>
Wed, 29 Apr 2015 21:07:26 -0700
changeset 273120 24ddf11d9c1dd8f1330d2cd9d4213cb8eef92afa
parent 273119 e9735c142acc361bd8ab7fec82c3d8ba6e248cdd
child 273121 db801cb03216dcae059460479df7e29b72ce4b09
push id863
push userraliiev@mozilla.com
push dateMon, 03 Aug 2015 13:22:43 +0000
treeherdermozilla-release@f6321b14228d [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