Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-24 09:38:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

autotest: detect ap-*.core as we do core.* files

Browse Source
This commit is contained in:
Peter Barker 2021-07-06 15:53:19 +10:00 committed by Peter Barker
parent fd803ddafc
commit 743ed05367
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tools/autotest/autotest.py
View File

@ -701,7 +701,7 @@ def run_tests(steps):
diagnostic_files = [] diagnostic_files = []
for p in "dumpstack.sh_*", "dumpcore.sh_*", "autotest-*tlog": for p in "dumpstack.sh_*", "dumpcore.sh_*", "autotest-*tlog":
diagnostic_files.extend(glob.glob()) diagnostic_files.extend(glob.glob(p))
if diagnostic_files: if diagnostic_files:
print('Removing diagnostic files: %s' % str(diagnostic_files)) print('Removing diagnostic files: %s' % str(diagnostic_files))
for f in diagnostic_files: for f in diagnostic_files:

11
Tools/autotest/common.py
View File

@ -5766,7 +5766,10 @@ Also, ignores heartbeats not from our target system'''
shutil.move(log, newname) shutil.move(log, newname)
# move core files # move core files
save_binaries = False save_binaries = False
for log in sorted(glob.glob("core*")): corefiles = []
corefiles.extend(glob.glob("core*"))
corefiles.extend(glob.glob("ap-*.core"))
for log in sorted(corefiles):
bname = os.path.basename(log) bname = os.path.basename(log)
newname = os.path.join(to_dir, "%s-%s-%s" % (bname, self.log_name(), name)) newname = os.path.join(to_dir, "%s-%s-%s" % (bname, self.log_name(), name))
print("Renaming %s to %s" % (log, newname)) print("Renaming %s to %s" % (log, newname))
@ -5873,7 +5876,9 @@ Also, ignores heartbeats not from our target system'''
util.pexpect_close(self._mavproxy) util.pexpect_close(self._mavproxy)
self._mavproxy = None self._mavproxy = None
corefiles = glob.glob("core*") corefiles = []
corefiles.extend(glob.glob("core*"))
corefiles.extend(glob.glob("ap-*.core"))
if corefiles: if corefiles:
self.progress('Corefiles detected: %s' % str(corefiles)) self.progress('Corefiles detected: %s' % str(corefiles))
passed = False passed = False
@ -8785,7 +8790,7 @@ switch value'''
self.progress("Failed with timeout") self.progress("Failed with timeout")
self.fail_list.append(["Failed with timeout", None, None]) self.fail_list.append(["Failed with timeout", None, None])
if self.logs_dir: if self.logs_dir:
if glob.glob("core*"): if glob.glob("core*") or glob.glob("ap-*.core"):
self.check_logs("FRAMEWORK") self.check_logs("FRAMEWORK")
if self.rc_thread is not None: if self.rc_thread is not None: