summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorTom Callaway <spot@fedoraproject.org>2020-09-12 04:28:27 -0400
committerGitHub <noreply@github.com>2020-09-12 09:28:27 +0100
commitd7d08595e2c354d4c7245e3986ceed353d336ff5 (patch)
treec1eef504b90226110f95e15ee1ebc4d49e283f8a /test
parent83f682385543d949e4ee5e1271a96beddaa9a23b (diff)
downloadfuse-d7d08595e2c354d4c7245e3986ceed353d336ff5.tar.gz
Update Travis to Ubuntu Bionic
Diffstat (limited to 'test')
-rw-r--r--test/pytest.ini2
-rwxr-xr-xtest/travis-build.sh2
2 files changed, 3 insertions, 1 deletions
diff --git a/test/pytest.ini b/test/pytest.ini
index 9516154..036a9f4 100644
--- 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 6e2afd5..3685909 100755
--- 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