debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-25 04:18:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

test: define GMime version dependant breakage

Browse source 
We have some tests where the gmime 3 behaviour seems like a bug fix,
others where it's less clear, so we allow both possibilities.
This commit is contained in:
David Bremner 2017-05-27 13:51:18 -03:00
parent 6977316a5f
commit 6ac3d8c27f
2 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
configure vendored
View file

@ -489,11 +489,13 @@ if pkg-config --exists "gmime-3.0"; then
have_gmime=1 have_gmime=1
gmime_cflags=$(pkg-config --cflags gmime-3.0) gmime_cflags=$(pkg-config --cflags gmime-3.0)
gmime_ldflags=$(pkg-config --libs gmime-3.0) gmime_ldflags=$(pkg-config --libs gmime-3.0)
gmime_major=3
elif pkg-config --exists "gmime-2.6 >= $GMIME_MINVER"; then elif pkg-config --exists "gmime-2.6 >= $GMIME_MINVER"; then
printf "Yes (2.6).\n" printf "Yes (2.6).\n"
have_gmime=1 have_gmime=1
gmime_cflags=$(pkg-config --cflags gmime-2.6) gmime_cflags=$(pkg-config --cflags gmime-2.6)
gmime_ldflags=$(pkg-config --libs gmime-2.6) gmime_ldflags=$(pkg-config --libs gmime-2.6)
gmime_major=2
else else
have_gmime=0 have_gmime=0
printf "No.\n" printf "No.\n"
@ -1212,6 +1214,9 @@ NOTMUCH_PYTHON=${python}
# building/testing ruby bindings. # building/testing ruby bindings.
NOTMUCH_HAVE_RUBY_DEV=${have_ruby_dev} NOTMUCH_HAVE_RUBY_DEV=${have_ruby_dev}
# Major version of gmime
NOTMUCH_GMIME_MAJOR=${gmime_major}
# Platform we are run on # Platform we are run on
PLATFORM=${platform} PLATFORM=${platform}
EOF EOF

16
test/test-lib.sh
View file

@ -1202,6 +1202,22 @@ test_init_ () {
. ./test-lib-common.sh || exit 1 . ./test-lib-common.sh || exit 1
if [ "${NOTMUCH_GMIME_MAJOR}" = 3 ]; then
test_subtest_broken_gmime_3 () {
test_subtest_known_broken
}
test_subtest_broken_gmime_2 () {
true
}
else
test_subtest_broken_gmime_3 () {
true
}
test_subtest_broken_gmime_2 () {
test_subtest_known_broken
}
fi
emacs_generate_script emacs_generate_script