aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorNikolaus Rath <Nikolaus@rath.org>2021-01-19 10:16:41 +0000
committerNikolaus Rath <Nikolaus@rath.org>2021-01-19 10:17:10 +0000
commitd18869a30746406ab26da1561afd197b68cbe878 (patch)
treeb885e3c12ff8edc785775ac366a325d219672743 /test
parentdfd4cba3856cea89037f1e8dc217f692e87c7edf (diff)
downloadsshfs-d18869a30746406ab26da1561afd197b68cbe878.tar
sshfs-d18869a30746406ab26da1561afd197b68cbe878.tar.gz
sshfs-d18869a30746406ab26da1561afd197b68cbe878.tar.bz2
sshfs-d18869a30746406ab26da1561afd197b68cbe878.zip
Update to newer CI environment.
The current one causes build failures since recent pytest versions are incompatble with Python 3.5.
Diffstat (limited to 'test')
-rwxr-xr-xtest/travis-build.sh2
-rwxr-xr-xtest/travis-install.sh7
2 files changed, 1 insertions, 8 deletions
diff --git a/test/travis-build.sh b/test/travis-build.sh
index c4ed185..bed71ee 100755
--- a/test/travis-build.sh
+++ b/test/travis-build.sh
@@ -12,7 +12,7 @@ export CC
TEST_CMD="python3 -m pytest --maxfail=99 test/"
# Standard build with Valgrind
-for CC in gcc gcc-6 clang; do
+for CC in gcc clang; do
mkdir build-${CC}; cd build-${CC}
if [ ${CC} == 'gcc-6' ]; then
build_opts='-D b_lundef=false'
diff --git a/test/travis-install.sh b/test/travis-install.sh
index 23cc0ad..a6d9d26 100755
--- a/test/travis-install.sh
+++ b/test/travis-install.sh
@@ -2,19 +2,12 @@
set -e
-# Meson 0.45 requires Python 3.5 or newer
-sudo python3 -m pip install pytest meson==0.44
-valgrind --version
-ninja --version
-meson --version
-
# Install fuse
wget https://github.com/libfuse/libfuse/archive/master.zip
unzip master.zip
cd libfuse-master
mkdir build
cd build
-export CC=gcc-6
meson ..
ninja
sudo ninja install