aboutsummaryrefslogtreecommitdiff
path: root/linaro-art-tip-build-ARTTargetTest.yaml
diff options
context:
space:
mode:
authorDaniel Díaz <daniel.diaz@linaro.org>2016-06-23 16:29:59 -0500
committerDaniel Díaz <daniel.diaz@linaro.org>2016-06-23 21:33:17 -0500
commit980eb79a12105006be5e839aec56182df149fa6e (patch)
treed0422169adf5f0b001a416fd518ef77707260992 /linaro-art-tip-build-ARTTargetTest.yaml
parent9389ad58d6c1d75bc78d065356db871c106c6117 (diff)
art: Safely kill remote ADB instances.
No functional change, just one line less. Change-Id: I6e4c11a883401c8bbe2f6c3d706ef37dbab63268 Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org>
Diffstat (limited to 'linaro-art-tip-build-ARTTargetTest.yaml')
-rw-r--r--linaro-art-tip-build-ARTTargetTest.yaml4
1 files changed, 1 insertions, 3 deletions
diff --git a/linaro-art-tip-build-ARTTargetTest.yaml b/linaro-art-tip-build-ARTTargetTest.yaml
index b73958e4..4f1fb86f 100644
--- a/linaro-art-tip-build-ARTTargetTest.yaml
+++ b/linaro-art-tip-build-ARTTargetTest.yaml
@@ -89,9 +89,7 @@
source /home/buildslave/srv/nexus-config
export ANDROID_SERIAL=${BULLHEAD}
export ANDROID_ADB_SERVER_PORT=${ANDROID_ADB_SERVER_PORT_TIP}
- set +e
- ssh nexus-machine killall adb-stable adb-tip
- set -e
+ ssh nexus-machine killall adb-stable adb-tip ||:
ssh nexus-machine ./adb-tip -P ${ANDROID_ADB_SERVER_PORT} start-server
ssh -L ${ANDROID_ADB_SERVER_PORT}:127.0.0.1:${ANDROID_ADB_SERVER_PORT} nexus-machine -f -N