diff options
| author | Simon McVittie <smcv@collabora.com> | 2022-06-27 18:22:30 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2022-07-13 20:36:13 +0100 |
| commit | 82ec4cf28fbae3e400784710846c7b71190ecbb0 (patch) | |
| tree | 4a2fd29601841d0f0ac4312fe81373e96355d7fe /.gitlab-ci.yml | |
| parent | 7de7b215f61567b90cccfe15a6cc4ed46338aa80 (diff) | |
| download | dbus-82ec4cf28fbae3e400784710846c7b71190ecbb0.tar.gz | |
CI: Skip tests that run dbus-daemon when running on Windows
Mitigates: #400
Signed-off-by: Simon McVittie <smcv@collabora.com>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b4323d3c..b1418c3f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -347,7 +347,7 @@ windows-meson-mingw-ucrt64: - C:\msys64\usr\bin\bash -lc " meson build && ninja -j1 -C build && - meson test -C build" + meson test --no-suite=runs-dbus-daemon -C build" artifacts: reports: junit: "build/meson-logs/testlog.junit.xml" @@ -360,10 +360,11 @@ windows-meson-mingw-ucrt64: windows-meson-vs15-x86: extends: .win-build script: + # FIXME: tests that run dbus-daemon time out on the Gitlab runner - cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=x86 && meson --force-fallback-for=expat,glib,zlib build && meson compile -C build && - meson test -C build" + meson test --no-suite=runs-dbus-daemon -C build" artifacts: reports: junit: "build/meson-logs/testlog.junit.xml" |