From 31ba99e58ae5d9bb7db4d85a39c7dd4a6f4216b4 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Thu, 15 Mar 2018 22:45:09 +1100 Subject: [PATCH] Tools: autotest: use buildlogs_path for all buildlogs --- Tools/autotest/arducopter.py | 4 ++-- Tools/autotest/ardusub.py | 2 +- Tools/autotest/quadplane.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Tools/autotest/arducopter.py b/Tools/autotest/arducopter.py index 87a3d0d038..37396b5493 100644 --- a/Tools/autotest/arducopter.py +++ b/Tools/autotest/arducopter.py @@ -1424,7 +1424,7 @@ class AutoTestCopter(AutoTest): # wait for disarm self.mav.motors_disarmed_wait() - log_filepath = util.reltopdir("../buildlogs/ArduCopter-log.bin") + log_filepath = self.buildlogs_path("ArduCopter-log.bin") if not self.log_download(log_filepath): failed_test_msg = "log_download failed" self.progress(failed_test_msg) @@ -1484,7 +1484,7 @@ class AutoTestCopter(AutoTest): self.set_rc(8, 1000) # mission ends with disarm so should be ok to download logs now - log_path = util.reltopdir("../buildlogs/Helicopter-log.bin") + log_path = self.buildlogs_path("Helicopter-log.bin") if not self.log_download(log_path): failed_test_msg = "log_download failed" self.progress(failed_test_msg) diff --git a/Tools/autotest/ardusub.py b/Tools/autotest/ardusub.py index 3e4e2c655d..5a7ce884d9 100644 --- a/Tools/autotest/ardusub.py +++ b/Tools/autotest/ardusub.py @@ -92,7 +92,7 @@ class AutoTestSub(AutoTest): logfile = self.mavproxy.match.group(1) self.progress("LOGFILE %s" % logfile) - buildlog = util.reltopdir("../buildlogs/ArduSub-test.tlog") + buildlog = self.buildlogs_path("ArduSub-test.tlog") self.progress("buildlog=%s" % buildlog) if os.path.exists(buildlog): os.unlink(buildlog) diff --git a/Tools/autotest/quadplane.py b/Tools/autotest/quadplane.py index 18d88844b1..7f35672eaa 100644 --- a/Tools/autotest/quadplane.py +++ b/Tools/autotest/quadplane.py @@ -72,7 +72,7 @@ class AutoTestQuadPlane(AutoTest): logfile = self.mavproxy.match.group(1) self.progress("LOGFILE %s" % logfile) - buildlog = util.reltopdir("../buildlogs/QuadPlane-test.tlog") + buildlog = self.buildlogs_path("QuadPlane-test.tlog") self.progress("buildlog=%s" % buildlog) if os.path.exists(buildlog): os.unlink(buildlog)