[Spice-commits] 2 commits - .gitlab-ci.yml server/spice-qxl.h server/tests

[GitLab Mirror]

 .gitlab-ci.yml                     |   22 +++++++++++++++++-----
 server/spice-qxl.h                 |    2 +-
 server/tests/test-display-base.cpp |    2 +-
 3 files changed, 19 insertions(+), 7 deletions(-)

New commits:
commit a56e65187e4497bc87bf5d152464f75b38b1d7b5
Author: Frediano Ziglio <freddy77 at gmail.com>
Date:   Mon Feb 8 08:29:18 2021 +0000

    ci: Use Ubuntu Bionic for websocket-autobahn job
    
    Autobahn testsuite is based on Python 2.
    See https://github.com/crossbario/autobahn-testsuite/issues/109.
    
    Temporarily use an Ubuntu LTS distro still having Python 2, this will
    make the job work for some years.
    
    Hoping in the future to either:
    - update Autobahn testsuite to Python 3;
    - finding another testsuite for websockets.
    
    Signed-off-by: Frediano Ziglio <freddy77 at gmail.com>
    Acked-by: Marc-André Lureau <marcandre.lureau at redhat.com>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e7594f43..7d3ba538 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -164,12 +164,24 @@ makecheck-windows:
   - mingw64-make LOG_COMPILE=wine -C server check || (cat server/tests/test-suite.log && exit 1)
 
 websocket-autobahn:
+  before_script:
+    - apt-get update -y
+    - >
+      apt-get install -y
+      debhelper
+      gstreamer1.0-libav gstreamer1.0-plugins-base gstreamer1.0-plugins-good
+      gstreamer1.0-plugins-ugly gstreamer1.0-tools
+      libgstreamer-plugins-base1.0-dev libgstreamer1.0-dev
+      libcacard-dev libglib2.0-dev
+      libjpeg-dev liblz4-dev libopus-dev libpixman-1-dev libsasl2-dev
+      libssl-dev pkg-config
+      python3-six python3-pyparsing liborc-0.4-dev git
+      g++ autoconf-archive python-pip
+      python3 python3-pip python3-setuptools python3-wheel ninja-build
+    - pip3 install meson
+    - *protocol
+  image: ubuntu:bionic
   script:
-  - >
-    dnf install python27 python-unversioned-command curl
-    -y
-  - curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
-  - python2 get-pip.py
   - pip2 install autobahntestsuite
   - wstest -a
   - git clean -fdx
commit 9af2193f2c4e25a35185c1b0a9da9e204b2caa6b
Author: Frediano Ziglio <freddy77 at gmail.com>
Date:   Mon Feb 8 08:16:57 2021 +0000

    Fix non-trivial designated initializers for old Gnu C++ compilers
    
    Fix this error reported by some older Gnu C++ compilers:
    
    ./server/tests/test-display-base.cpp:818:1: sorry, unimplemented: non-trivial designated initializers not supported
    
    Signed-off-by: Frediano Ziglio <freddy77 at gmail.com>
    Acked-by: Marc-André Lureau <marcandre.lureau at redhat.com>

diff --git a/server/spice-qxl.h b/server/spice-qxl.h
index 13f93516..01882b82 100644
--- a/server/spice-qxl.h
+++ b/server/spice-qxl.h
@@ -188,8 +188,8 @@ struct QXLInterface {
     SpiceBaseInterface base;
 
     union {
-        void (*attache_worker)(QXLInstance *qin, QXLWorker *qxl_worker) SPICE_GNUC_DEPRECATED;
         void (*attached_worker)(QXLInstance *qin);
+        void (*attache_worker)(QXLInstance *qin, QXLWorker *qxl_worker) SPICE_GNUC_DEPRECATED;
     };
     void (*set_compression_level)(QXLInstance *qin, int level);
     void (*set_mm_time)(QXLInstance *qin, uint32_t mm_time) SPICE_GNUC_DEPRECATED;
diff --git a/server/tests/test-display-base.cpp b/server/tests/test-display-base.cpp
index 70814f1f..ae6ea1ac 100644
--- a/server/tests/test-display-base.cpp
+++ b/server/tests/test-display-base.cpp
@@ -798,7 +798,7 @@ static QXLInterface display_sif = {
         .major_version = SPICE_INTERFACE_QXL_MAJOR,
         .minor_version = SPICE_INTERFACE_QXL_MINOR
     },
-    .attached_worker = attached_worker,
+    { .attached_worker = attached_worker },
     .set_compression_level = set_compression_level,
     .set_mm_time = NULL,
     .get_init_info = get_init_info,