diff options
| -rw-r--r-- | .travis.yml | 12 | ||||
| -rwxr-xr-x | test/travis-build.sh | 2 | ||||
| -rwxr-xr-x | test/travis-install.sh | 7 |
3 files changed, 7 insertions, 14 deletions
diff --git a/.travis.yml b/.travis.yml index 0c4ae27..b19fd56 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,21 +1,21 @@ -sudo: required -dist: xenial +dist: focal +sudo: enabled language: - c addons: apt: - sources: - - ubuntu-toolchain-r-test packages: - valgrind - - clang - gcc - - gcc-6 + - clang - python-docutils - python3-pip - python3-setuptools - ninja-build + - meson + - python3-pytest + - libglib2.0-dev install: test/travis-install.sh script: test/travis-build.sh 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 |