aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorNikolaus Rath <Nikolaus@rath.org>2019-04-14 12:12:24 +0100
committerNikolaus Rath <Nikolaus@rath.org>2019-04-14 12:14:29 +0100
commitcf6942a5febcee6c4e6bdbe10eda59b46695fcad (patch)
treea68fb06f811c056f4b3ede1600707167ed846392 /test
parent23f68586955a16ed957fc1d5a284d2fc63e02bf5 (diff)
downloadsshfs-cf6942a5febcee6c4e6bdbe10eda59b46695fcad.tar
sshfs-cf6942a5febcee6c4e6bdbe10eda59b46695fcad.tar.gz
sshfs-cf6942a5febcee6c4e6bdbe10eda59b46695fcad.tar.bz2
sshfs-cf6942a5febcee6c4e6bdbe10eda59b46695fcad.zip
Update Travis build environment.
Diffstat (limited to 'test')
-rwxr-xr-xtest/travis-build.sh1
-rwxr-xr-xtest/travis-install.sh11
2 files changed, 4 insertions, 8 deletions
diff --git a/test/travis-build.sh b/test/travis-build.sh
index ba04295..601e849 100755
--- a/test/travis-build.sh
+++ b/test/travis-build.sh
@@ -36,6 +36,7 @@ for san in undefined address; do
meson -D b_sanitize=${san} -D b_lundef=false -D werror=true ..
ninja
${TEST_CMD}
+ sudo ninja install
cd ..
done
diff --git a/test/travis-install.sh b/test/travis-install.sh
index d7d1f05..4068f12 100755
--- a/test/travis-install.sh
+++ b/test/travis-install.sh
@@ -2,19 +2,14 @@
set -e
-sudo ln -svf $(which python3) /usr/bin/python3
-sudo python3 -m pip install pytest meson
-wget https://github.com/ninja-build/ninja/releases/download/v1.7.2/ninja-linux.zip
-unzip ninja-linux.zip
-chmod 755 ninja
-sudo chown root:root ninja
-sudo mv -fv ninja /usr/local/bin
+# Meson 0.45 requires Python 3.5 or newer
+sudo python3 -m pip install pytest meson==0.44
valgrind --version
ninja --version
meson --version
# Setup ssh
-ssh-keygen -b 768 -t rsa -f ~/.ssh/id_rsa -P ''
+ssh-keygen -b 1024 -t rsa -f ~/.ssh/id_rsa -P ''
cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys
chmod 600 ~/.ssh/authorized_keys
ssh -o "StrictHostKeyChecking=no" localhost echo "SSH connection succeeded"