Skip to content

Commit

Permalink
meson: Default to expecting test failures on known platforms
Browse files Browse the repository at this point in the history
  • Loading branch information
nomis committed May 11, 2021
1 parent f08ce3d commit f18e8a9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -144,9 +144,9 @@ install:

script:
- if [ "$BUILD" = "app" ]; then
make CC=$C_COMPILER CXX=$CXX_COMPILER DESTDIR="`pwd`/build/install" MESON_OPTS="-Dtest_expect_fail=true" distclean check install || exit 1;
make CC=$C_COMPILER CXX=$CXX_COMPILER DESTDIR="`pwd`/build/install" distclean check install || exit 1;
if [ $UNITY -eq 1 ]; then
make CC=$C_COMPILER CXX=$CXX_COMPILER DESTDIR="`pwd`/build/install" MESON_OPTS="-Dtest_expect_fail=true --unity on" distclean check install || exit 1;
make CC=$C_COMPILER CXX=$CXX_COMPILER DESTDIR="`pwd`/build/install" MESON_OPTS="--unity on" distclean check install || exit 1;
fi;
elif [ "$BUILD" = "docs" ]; then
make -C docs man html linkcheck || exit 1;
Expand Down
2 changes: 1 addition & 1 deletion meson_options.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
option('strict_packaging', type: 'boolean', value: false, description: 'Require all dependencies used for packaging')
option('test_expect_fail', type: 'boolean', value: false, description: 'Expect test failures on known platforms')
option('test_expect_fail', type: 'boolean', value: true, description: 'Expect test failures on known platforms')

0 comments on commit f18e8a9

Please sign in to comment.