Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-14 11:54:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

autotest: create SIL object to hold valgrind logpath

Browse Source
This commit is contained in:
Peter Barker 2016-05-27 16:45:25 +10:00 committed by Lucas De Marchi
parent ced07906ad
commit 3548f90d3a
5 changed files with 67 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Tools/autotest/apmrover2.py
View File

@ -175,9 +175,10 @@ def drive_APMrover2(binary, viewerip=None, map=False, valgrind=False):
util.pexpect_close(mavproxy) util.pexpect_close(mavproxy)
util.pexpect_close(sil) util.pexpect_close(sil)
if os.path.exists('APMrover2-valgrind.log'): valgrind_log = sil.valgrind_log_filepath()
os.chmod('APMrover2-valgrind.log', 0644) if os.path.exists(valgrind_log):
shutil.copy("APMrover2-valgrind.log", util.reltopdir("../buildlogs/APMrover2-valgrind.log")) os.chmod(valgrind_log, 0644)
shutil.copy(valgrind_log, util.reltopdir("../buildlogs/APMrover2-valgrind.log"))
if failed: if failed:
print("FAILED: %s" % e) print("FAILED: %s" % e)

12
Tools/autotest/arducopter.py
View File

@ -1243,9 +1243,10 @@ def fly_ArduCopter(binary, viewerip=None, map=False, valgrind=False):
util.pexpect_close(mavproxy) util.pexpect_close(mavproxy)
util.pexpect_close(sil) util.pexpect_close(sil)
if os.path.exists('ArduCopter-valgrind.log'): valgrind_log = sil.valgrind_log_filepath()
os.chmod('ArduCopter-valgrind.log', 0644) if os.path.exists(valgrind_log):
shutil.copy("ArduCopter-valgrind.log", util.reltopdir("../buildlogs/ArduCopter-valgrind.log")) os.chmod(valgrind_log, 0644)
shutil.copy(valgrind_log, util.reltopdir("../buildlogs/ArduCopter-valgrind.log"))
# [2014/05/07] FC Because I'm doing a cross machine build (source is on host, build is on guest VM) I cannot hard link # [2014/05/07] FC Because I'm doing a cross machine build (source is on host, build is on guest VM) I cannot hard link
# This flag tells me that I need to copy the data out # This flag tells me that I need to copy the data out
@ -1368,6 +1369,11 @@ def fly_CopterAVC(binary, viewerip=None, map=False, valgrind=False):
util.pexpect_close(mavproxy) util.pexpect_close(mavproxy)
util.pexpect_close(sil) util.pexpect_close(sil)
valgrind_log = sil.valgrind_log_filepath()
if os.path.exists(valgrind_log):
os.chmod(valgrind_log, 0644)
shutil.copy(valgrind_log, util.reltopdir("../buildlogs/Helicopter-valgrind.log"))
if failed: if failed:
print("FAILED: %s" % failed_test_msg) print("FAILED: %s" % failed_test_msg)
return False return False

7
Tools/autotest/arduplane.py
View File

@ -553,9 +553,10 @@ def fly_ArduPlane(binary, viewerip=None, map=False, valgrind=False):
util.pexpect_close(mavproxy) util.pexpect_close(mavproxy)
util.pexpect_close(sil) util.pexpect_close(sil)
if os.path.exists('ArduPlane-valgrind.log'): valgrind_log = sil.valgrind_log_filepath()
os.chmod('ArduPlane-valgrind.log', 0644) if os.path.exists(valgrind_log):
shutil.copy("ArduPlane-valgrind.log", util.reltopdir("../buildlogs/ArduPlane-valgrind.log")) os.chmod(valgrind_log, 0644)
shutil.copy(valgrind_log, util.reltopdir("../buildlogs/ArduPlane-valgrind.log"))
if failed: if failed:
print("FAILED: %s" % e) print("FAILED: %s" % e)

32
Tools/autotest/pysim/util.py
View File

@ -126,18 +126,21 @@ def cmd_as_shell(cmd):
import re import re
def make_safe_filename(text): def make_safe_filename(text):
'''return a version of text safe for use as a filename''' '''return a version of text safe for use as a filename'''
r = re.compile("([^a-zA-Z0-9_.-])") r = re.compile("([^a-zA-Z0-9_.+-])")
text.replace('/','-') text.replace('/','-')
filename = r.sub(lambda m : "%" + str(hex(ord(str(m.group(1))))).upper(), text) filename = r.sub(lambda m : "%" + str(hex(ord(str(m.group(1))))).upper(), text)
return filename return filename
def start_SIL(binary, valgrind=False, gdb=False, wipe=False, synthetic_clock=True, home=None, model=None, speedup=1, defaults_file=None): import pexpect
'''launch a SIL instance''' class SIL(pexpect.spawn):
import pexpect
def __init__(self, binary, valgrind=False, gdb=False, wipe=False, synthetic_clock=True, home=None, model=None, speedup=1, defaults_file=None):
self.binary = binary
self.model = model
cmd=[] cmd=[]
if valgrind and os.path.exists('/usr/bin/valgrind'): if valgrind and os.path.exists('/usr/bin/valgrind'):
safe_filename = make_safe_filename(os.path.basename(binary)) cmd.extend(['valgrind', '-q', '--log-file=%s' % self.valgrind_log_filepath()])
cmd.extend(['valgrind', '-q', '--log-file=%s-valgrind.log' % safe_filename])
if gdb: if gdb:
f = open("/tmp/x.gdb", "w") f = open("/tmp/x.gdb", "w")
f.write("r\n"); f.write("r\n");
@ -160,13 +163,20 @@ def start_SIL(binary, valgrind=False, gdb=False, wipe=False, synthetic_clock=Tru
print("Running: %s" % cmd_as_shell(cmd)) print("Running: %s" % cmd_as_shell(cmd))
first = cmd[0] first = cmd[0]
rest = cmd[1:] rest = cmd[1:]
ret = pexpect.spawn(first, rest, logfile=sys.stdout, timeout=5) super(SIL,self).__init__(first, rest, logfile=sys.stdout, timeout=5)
ret.delaybeforesend = 0 delaybeforesend = 0
pexpect_autoclose(ret) pexpect_autoclose(self)
# give time for parameters to properly setup # give time for parameters to properly setup
time.sleep(3) time.sleep(3)
ret.expect('Waiting for connection',timeout=300) self.expect('Waiting for connection',timeout=300)
return ret
def valgrind_log_filepath(self):
return make_safe_filename('%s-%s-valgrind.log' % (os.path.basename(self.binary),self.model,))
def start_SIL(binary, **kwargs):
'''launch a SIL instance'''
return SIL(binary, **kwargs)
def start_MAVProxy_SIL(atype, aircraft=None, setup=False, master='tcp:127.0.0.1:5760', def start_MAVProxy_SIL(atype, aircraft=None, setup=False, master='tcp:127.0.0.1:5760',
options=None, logfile=sys.stdout): options=None, logfile=sys.stdout):

7
Tools/autotest/quadplane.py
View File

@ -120,9 +120,10 @@ def fly_QuadPlane(binary, viewerip=None, map=False, valgrind=False):
util.pexpect_close(mavproxy) util.pexpect_close(mavproxy)
util.pexpect_close(sil) util.pexpect_close(sil)
if os.path.exists('QuadPlane-valgrind.log'): valgrind_log = sil.valgrind_log_filepath()
os.chmod('QuadPlane-valgrind.log', 0644) if os.path.exists(valgrind_log):
shutil.copy("QuadPlane-valgrind.log", util.reltopdir("../buildlogs/QuadPlane-valgrind.log")) os.chmod(valgrind_log, 0644)
shutil.copy(valgrind_log, util.reltopdir("../buildlogs/QuadPlane-valgrind.log"))
if failed: if failed:
print("FAILED: %s" % e) print("FAILED: %s" % e)