Update Travis to Ubuntu Bionic

diff --git a/.travis.yml b/.travis.yml
index 48a92ff3a82056cbb3b2887425d4ec31bfd730f9..bcee2f2f0e7f7d5e24fd04579f127b8cb9b51dcf 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,19 @@
 sudo: required
 dist: bionic
 
+before_install:
+    - curl https://spot.fedorapeople.org/spotfoss-ppa.key | sudo apt-key add -
+    - wget https://launchpad.net/~spotfoss/+archive/ubuntu/ppa/+files/valgrind_3.16.1-2_amd64.deb
+    - sudo apt install ./valgrind_3.16.1-2_amd64.deb
 language:
     - c
     - c++
 addons:
   apt:
     sources:
-    - ubuntu-toolchain-r-test
+    - sourceline: 'ppa:ubuntu-toolchain-r/test'
     packages:
     - doxygen
-    - valgrind
     - clang
     - libstdc++-7-dev 
     - libstdc++-10-dev

diff --git a/meson.build b/meson.build
index e17ebb0441a2d5d87deeb0e06bfe349b46395c12..b2b85dab21ea233faa6742cf854cafd4eed76142 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -89,12 +89,17 @@ endif
 
 # gcc-10 and newer support the symver attribute which we need to use if we
 # want to support LTO
+# recent clang and gcc both support __has_attribute (and if they are too old
+# to have __has_attribute, then they are too old to support symver)
+# other compilers might not have __has_attribute, but in those cases
+# it is safe for this check to fail and for us to fallback to the old _asm_
+# method for symver
 code = '''
-__attribute__((symver ("get@@TEST_0"))) int get_4() {
-    return 4;
-}
+#if defined __has_attribute && !__has_attribute (symver)
+#error symver attribute not supported
+#endif
+
 int main(void) {
-    (void) get_4();
     return 0;
 }'''
 if cc.compiles(code, args: [ '-O0', '-c'])

diff --git a/test/pytest.ini b/test/pytest.ini
index 95161546e625a2ceb57a44ede688e774d9f30664..036a9f40fb4d21d8604a5cd7a269c59109cb0f36 100644 (file)
--- a/test/pytest.ini
+++ b/test/pytest.ini
@@ -1,2 +1,4 @@
 [pytest]
 addopts = --verbose --assert=rewrite --tb=native -x -r a
+markers = 
+    uses_fuse: Indicates that FUSE is supported.

diff --git a/test/travis-build.sh b/test/travis-build.sh
index 6e2afd5d56b2fe0fc983fa4e1fdc6e45fe9e6e5d..36859098c0fb55369c07301f7ce8efd6d35dc79d 100755 (executable)
--- a/test/travis-build.sh
+++ b/test/travis-build.sh
@@ -36,7 +36,7 @@ for CC in gcc gcc-7 gcc-10 clang; do
         build_opts=''
     fi
     if [ ${CC} == 'gcc-10' ]; then
-        build_opts='-Dc_args="-flto=auto -ffat-lto-objects"'
+        build_opts='-Dc_args=-flto=auto'
     else
         build_opts=''
     fi