Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

autotest: fix setup of sitl for macosx

This commit is contained in:
Siddharth Purohit 2018-01-21 02:24:03 +05:30 committed by Peter Barker
parent 8d344ef7b4
commit 8f074d52c1
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Tools/autotest/sim_vehicle.py
View File

@ -240,7 +240,8 @@ def kill_tasks():
if under_cygwin():
return kill_tasks_cygwin(victim_names)
if under_macos():
if under_macos() and os.environ.get('DISPLAY'):
#use special macos kill routine if Display is on
return kill_tasks_macos()
try:
@ -464,7 +465,7 @@ def run_in_terminal_window(autotest, name, cmd):
runme.extend(cmd)
progress_cmd("Run " + name, runme)
if under_macos():
if under_macos() and os.environ.get('DISPLAY'):
# on MacOS record the window IDs so we can close them later
out = subprocess.Popen(runme, stdout=subprocess.PIPE).communicate()[0]
import re
@ -478,7 +479,8 @@ def run_in_terminal_window(autotest, name, cmd):
break
time.sleep(0.1)
#sleep for extra 2 seconds for application to start
time.sleep(2)
if len(tabs) > 0:
windowID.append(tabs[0])
else: