From 991d111d91fb54ed18483bdcaca60bea9b81dfaa Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 5 Apr 2015 12:24:54 -0700 Subject: [PATCH] Travis: another attempt at fixing compiler path --- Tools/scripts/build_all_travis.sh | 2 ++ Tools/scripts/install-travis-env.sh | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Tools/scripts/build_all_travis.sh b/Tools/scripts/build_all_travis.sh index bba8dc1e58..de634a2437 100755 --- a/Tools/scripts/build_all_travis.sh +++ b/Tools/scripts/build_all_travis.sh @@ -8,6 +8,8 @@ set -e set -x +. ~/.profile + echo "Testing ArduPlane build" pushd ArduPlane make configure diff --git a/Tools/scripts/install-travis-env.sh b/Tools/scripts/install-travis-env.sh index 2cb218805a..8ff95b5d22 100755 --- a/Tools/scripts/install-travis-env.sh +++ b/Tools/scripts/install-travis-env.sh @@ -72,7 +72,7 @@ fi mkdir -p $OPT -cd $OPT; +cd $OPT wget $ARM_TARBALL_URL tar xjf ${ARM_TARBALL} rm -f ${ARM_TARBALL} @@ -82,4 +82,8 @@ echo $exportline >> ~/.profile exportline2="export PATH=$CWD/$ARDUPILOT_TOOLS:\$PATH"; echo $exportline2 >> ~/.profile -$exportline2 + +. ~/.profile +echo $PATH +ls -l $OPT/$ARM_ROOT/bin +