diff options
| -rw-r--r-- | .gitlab-ci.yml | 10 | ||||
| -rwxr-xr-x | build-aux/meson-dist | 1 | ||||
| -rw-r--r-- | build-aux/meson-win-wrapper.txt | 2 | ||||
| -rw-r--r-- | server/tests/meson.build | 2 |
4 files changed, 9 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 06009359..c84e6b24 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -163,18 +163,18 @@ makecheck-windows: mingw64-openssl mingw64-glib2 mingw64-glib-networking mingw64-libjpeg-turbo mingw64-pixman mingw64-opus mingw64-winpthreads mingw64-zlib mingw64-gstreamer1-plugins-base mingw64-gstreamer1-plugins-good mingw64-orc - meson - mkdir spice-protocol/build - (cd spice-protocol/build && mingw64-meson --werror && ninja install) - - NOCONFIGURE=yes ./autogen.sh - - mingw64-configure - - mingw64-make + - > + mingw64-meson --buildtype=release -Dlz4=false -Dsasl=false + --cross-file build-aux/meson-win-wrapper.txt build + - ninja -C build - export G_TLS_GNUTLS_PRIORITY="NORMAL:%COMPAT" - export WINEPATH='Z:\usr\x86_64-w64-mingw32\sys-root\mingw\bin' - export LANG=en_US.UTF-8 # Remove configuration otherwise OpenSSL initialization will fail - rm -f /usr/x86_64-w64-mingw32/sys-root/mingw/etc/pki/tls/openssl.cnf - - (cd server && exec mingw64-make LOG_COMPILE=wine check) || (cat server/tests/test-suite.log && exit 1) + - (cd build && exec meson test --suite spice -t 5) || (cat build/meson-logs/testlog.txt && exit 1) websocket-autobahn: before_script: diff --git a/build-aux/meson-dist b/build-aux/meson-dist index 7146ad1e..8ed05eea 100755 --- a/build-aux/meson-dist +++ b/build-aux/meson-dist @@ -21,6 +21,7 @@ find . -name .gitignore -delete rm -rf \ build-aux/useless-if-before-free \ build-aux/vc-list-files \ +build-aux/meson-win-wrapper.txt \ cfg.mk \ docs/how_to_release.md \ docs/manual/images/pepper.png \ diff --git a/build-aux/meson-win-wrapper.txt b/build-aux/meson-win-wrapper.txt new file mode 100644 index 00000000..976cf2ae --- /dev/null +++ b/build-aux/meson-win-wrapper.txt @@ -0,0 +1,2 @@ +[binaries] +exe_wrapper = 'wine' diff --git a/server/tests/meson.build b/server/tests/meson.build index 1ae7d37c..3e0606cd 100644 --- a/server/tests/meson.build +++ b/server/tests/meson.build @@ -1,5 +1,5 @@ test_lib_include = [spice_server_include, include_directories('.')] -test_lib_deps = [spice_server_deps] +test_lib_deps = [spice_server_deps, spice_common.get_variable('gio2_deps')] if host_machine.system() != 'windows' test_lib_deps += [dependency('gio-unix-2.0')] endif |