Merge branch 'fix-test-dbus-daemon-windows' into 'master'

tools/ci-build.sh: Double maximum test time when running tests on Windows

Closes #320 and #359

See merge request dbus/dbus!231
This commit is contained in:
Simon McVittie 2021-12-07 13:07:30 +00:00
commit 1877922b80

View file

@ -390,6 +390,8 @@ case "$ci_buildsys" in
fi
if [ "$ci_test" = yes ]; then
set "$@" -D DBUS_USE_WINE=1
# test-dbus-daemon needs more time on Windows
export DBUS_TEST_TIMEOUT_MULTIPLIER=2
fi
shift
;;