diff options
| -rw-r--r-- | .travis.yml | 7 | ||||
| -rwxr-xr-x | test/travis-build.sh | 1 | ||||
| -rwxr-xr-x | test/travis-install.sh | 11 |
3 files changed, 8 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml index 10d1f17..474fc99 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ sudo: required -dist: trusty +dist: xenial language: - c @@ -15,8 +15,9 @@ addons: - fuse - libfuse2 - libfuse-dev -before_install: - - pip install pip==8.1.1 && pip3 install pip==8.1.1 + - python3-pip + - python3-setuptools + - ninja-build install: test/travis-install.sh script: test/travis-build.sh 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" |