From 2a69a4c7dc9fb3dafe3bef9cff76f4bac6a7a947 Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Fri, 1 Dec 2017 23:47:01 -0800 Subject: [PATCH] Revert #780 (don't kill FRC_NetCommDaemon). (#795) This commit reverts commit 0f3f5218adaa912ddde572fd3e6a295acbdc3187. --- test-scripts/jenkins-run-tests-get-results.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test-scripts/jenkins-run-tests-get-results.sh b/test-scripts/jenkins-run-tests-get-results.sh index 9c151b6af8..d1975f4d97 100755 --- a/test-scripts/jenkins-run-tests-get-results.sh +++ b/test-scripts/jenkins-run-tests-get-results.sh @@ -14,12 +14,12 @@ source config.sh printf "Getting exclusive lock for RIO execution...\n" flock -x 200 || exit 1 -# To work around memory leak, kill NetComm and ensure the teststand is dead too -SSH_RESTART_NETCOMM="ssh -t ${ROBOT_ADDRESS} sh -c '/etc/init.d/teststand stop; sleep 1; killall FRC_NetCommDaemon; sleep 1'" +# Ensure the teststand is dead +SSH_STOP_TESTSTAND="ssh -t ${ROBOT_ADDRESS} sh -c '/etc/init.d/teststand stop; sleep 1'" if [ $(which sshpass) ]; then - sshpass -p "" ${SSH_RESTART_NETCOMM} + sshpass -p "" ${SSH_STOP_TESTSTAND} else - eval ${SSH_RESTART_NETCOMM} + eval ${SSH_STOP_TESTSTAND} fi # If there are already test results in the repository then remove them