diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2021-04-01 16:54:44 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-04-01 17:39:54 +0200 |
| commit | 6dfc7354d7100effa380ec7f6e368a2c0ec92232 (patch) | |
| tree | e25d2cb3b9bf213f68d9ae8602af74aeb6f72a7e /test/source | |
| parent | 2611b5c25551c38d047d8be058177bc7fbfc672d (diff) | |
Exclude tests based on device color depth, not RDP
After 5c9ba1f47d00ed10960b59928befd68f6c020b15, the failures on Jenkins
(see 21191d0d8953a3ca6eac6022c0a14a87fe9c5e2a) made it apparent that
(at least some of) Jenkins builds also run in RDP sessions. Since the
tests excluded in commit 9c6142ec26a0ba61b1cf58d1e6bf0b5376394bcd never
failed in Jenkins builds before, it is wrong to exclude all those tests
in all RDP sessions: our CI would not test those on Windows.
In the meanwhile, I discovered that the system that failed the tests
actually had 16-bit color depth, despite RDP being configured to use
32-bit colors; that was the reason why the colors were modified on
roundtrip. So it is better to test the actual problem to exclude tests.
This reimplements the check that was introduced in commit
9c6142ec26a0ba61b1cf58d1e6bf0b5376394bcd to test default virtual device
color depth.
Change-Id: I329a3e2d8eca21732c77dcacf15394d1246b2e18
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113460
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'test/source')
| -rw-r--r-- | test/source/bootstrapfixture.cxx | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/test/source/bootstrapfixture.cxx b/test/source/bootstrapfixture.cxx index 5116ac32115a..5ae9b3e4ab24 100644 --- a/test/source/bootstrapfixture.cxx +++ b/test/source/bootstrapfixture.cxx @@ -25,7 +25,9 @@ #include <osl/file.hxx> #include <osl/process.h> #include <unotools/tempfile.hxx> +#include <vcl/salgtype.hxx> #include <vcl/scheduler.hxx> +#include <vcl/virdev.hxx> #include <memory> #include <cstring> @@ -246,4 +248,11 @@ bool test::BootstrapFixture::IsDefaultDPI() && Application::GetDefaultDevice()->GetDPIY() == 96); } +sal_uInt16 test::BootstrapFixture::getDefaultDeviceBitCount() +{ + ScopedVclPtr<VirtualDevice> device + = VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT); + return device->GetBitCount(); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |