From 9c2678fdb94ca98820ba534f14f950b2116f1b3d Mon Sep 17 00:00:00 2001 From: James Kuszmaul Date: Tue, 21 Jul 2015 08:09:20 -0400 Subject: [PATCH] Make test scripts spawn driverstation as admin. Change-Id: Ic7f27fa902b2ac67c6785b7f422601ade3d23f2c --- test-scripts/config.sh | 1 + test-scripts/spawn_driver_station.sh | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/test-scripts/config.sh b/test-scripts/config.sh index 55cf7da613..c45d80064f 100755 --- a/test-scripts/config.sh +++ b/test-scripts/config.sh @@ -11,6 +11,7 @@ DEFAULT_LOCAL_TEST_RESULTS_DIR=../test-reports ROBOT_ADDRESS=lvuser@roboRIO-190.local +ADMIN_ROBOT_ADDRESS=admin@roboRIO-190.local DEFAULT_LOCAL_RUN_TEST_SCRIPT="run-tests-on-robot.sh" DEFAULT_DESTINATION_DIR=/home/lvuser diff --git a/test-scripts/spawn_driver_station.sh b/test-scripts/spawn_driver_station.sh index b48e0a7035..d41b41dec1 100755 --- a/test-scripts/spawn_driver_station.sh +++ b/test-scripts/spawn_driver_station.sh @@ -12,7 +12,9 @@ TESTSTAND_SERVE_COMMAND="/usr/local/frc/bin/teststand serve" #Checks to see if the mutex driver station is running. If it isn't then start it. -SSH_CHECK_FOR_TESTSTAND="ssh -qn ${ROBOT_ADDRESS} 'pidof ${TESTSTAND_SERVE_COMMAND}' &>/dev/null" +SSH_CHECK_FOR_TESTSTAND="ssh -qn ${ADMIN_ROBOT_ADDRESS} 'pidof ${TESTSTAND_SERVE_COMMAND}' &>/dev/null" + +TESTSTAND_SERVE_COMMAND="nohup ${TESTSTAND_SERVE_COMMAND} > /dev/null 2>&1 < /dev/null &" if [ $(which sshpass) ]; then SSH_CHECK_FOR_TESTSTAND="sshpass -p '' ${SSH_CHECK_FOR_TESTSTAND}" @@ -28,7 +30,7 @@ fi echo "Starting Driver Station"; function startDS { - SSH_START_TESTSTAND_DRIVER_STATION="ssh ${ROBOT_ADDRESS} ${TESTSTAND_SERVE_COMMAND}" + SSH_START_TESTSTAND_DRIVER_STATION="ssh ${ADMIN_ROBOT_ADDRESS} ${TESTSTAND_SERVE_COMMAND}" if [ $(which sshpass) ]; then sshpass -p "" ${SSH_START_TESTSTAND_DRIVER_STATION} else