From 2fb8aba1b2fa60a22dc5e7bc304d406cfdc96015 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 6 Jun 2019 09:10:32 +1000 Subject: [PATCH] autotest: use build path on faster filesystem --- Tools/scripts/build_autotest.sh | 3 +++ Tools/scripts/build_binaries.py | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Tools/scripts/build_autotest.sh b/Tools/scripts/build_autotest.sh index e5b3016d00..832b8d3685 100755 --- a/Tools/scripts/build_autotest.sh +++ b/Tools/scripts/build_autotest.sh @@ -118,6 +118,9 @@ killall -9 JSBSim || /bin/true # raise core limit ulimit -c 10000000 +# build in home dir, as on faster storage +export BUILD_BINARIES_PATH=$HOME/build/tmp + timelimit 32000 APM/Tools/autotest/autotest.py --timeout=30000 > buildlogs/autotest-output.txt 2>&1 (cd buildlogs && cp -f *.txt *.flashlog *.tlog *.km[lz] *.gpx *.html *.png *.bin *.BIN *.elf "history/$hdate/") diff --git a/Tools/scripts/build_binaries.py b/Tools/scripts/build_binaries.py index 8ab0ea5edc..4c34820ad6 100755 --- a/Tools/scripts/build_binaries.py +++ b/Tools/scripts/build_binaries.py @@ -680,7 +680,10 @@ is bob we will attempt to checkout bob-AVR''' origin_env_path = os.environ.get("PATH") os.environ["PATH"] = ':'.join([prefix_bin_dirpath, origin_env_path, "/bin", "/usr/bin"]) - self.tmpdir = os.path.join(os.getcwd(), 'build.tmp.binaries') + if 'BUILD_BINARIES_PATH' in os.environ: + self.tmpdir = os.environ['BUILD_BINARIES_PATH'] + else: + self.tmpdir = os.path.join(os.getcwd(), 'build.tmp.binaries') os.environ["TMPDIR"] = self.tmpdir print(self.tmpdir)