[Spice-commits] 2 commits - server/tests subprojects/spice-common

[GitLab Mirror]

 server/tests/test-codecs-parsing.c |    2 +-
 server/tests/test-vdagent.c        |    4 ++--
 subprojects/spice-common           |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 6e299f508172f0864858f10554cdb266f659f527
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date:   Tue Apr 13 21:32:24 2021 +0400

    Update spice-common
    
    Frediano Ziglio (7):
          codegen: Remove bytes array length support
          codegen: Make "output_attrs" variable global
          codegen: Add a check to array type
          codegen: Propagate attributes to element under pointers
          codegen: Propagate zero_terminated attribute
          codegen: Handle zero_terminated attribute in demashaller
          helper-fuzzer-demarshallers: Check also test demarshallers
          Fix make distcheck
    
    Marc-André Lureau (2):
          Fix invalid vdagent buffer access
          Fix build as meson subproject
    
    Stefan Weil (1):
          Add missing include file string.h
    
    Signed-off-by: Marc-André Lureau <marcandre.lureau at redhat.com>

diff --git a/subprojects/spice-common b/subprojects/spice-common
index d589542e..fcfe9104 160000
--- a/subprojects/spice-common
+++ b/subprojects/spice-common
@@ -1 +1 @@
-Subproject commit d589542e0492888ac1b300200c7c6cb4eaf88cb0
+Subproject commit fcfe9104bd62a5a1debfebf9ce25e96715662ab4
commit 9bd0d5cc817ffbba4160579090ecd7f9143a14d5
Author: Frediano Ziglio <freddy77 at gmail.com>
Date:   Wed Apr 14 14:40:09 2021 +0100

    Fix failure strings in tests
    
    Otherwise tests will fail due to source code change.
    
    Signed-off-by: Frediano Ziglio <freddy77 at gmail.com>

diff --git a/server/tests/test-codecs-parsing.c b/server/tests/test-codecs-parsing.c
index 0037c058..9cea298d 100644
--- a/server/tests/test-codecs-parsing.c
+++ b/server/tests/test-codecs-parsing.c
@@ -72,7 +72,7 @@ static void codecs_bad(void)
         },{
             NULL,
             G_LOG_LEVEL_CRITICAL,
-            "*assertion 'codecs != NULL' failed",
+            "*assertion 'codecs != nullptr' failed",
             FALSE,
         },{
             ";:;",
diff --git a/server/tests/test-vdagent.c b/server/tests/test-vdagent.c
index f0178b4f..1afdf7f3 100644
--- a/server/tests/test-vdagent.c
+++ b/server/tests/test-vdagent.c
@@ -114,7 +114,7 @@ static void test_multiple_vmc_devices(void)
     g_test_expect_message(G_LOG_DOMAIN, G_LOG_LEVEL_WARNING,
                           "*spice_server_char_device_add_interface: vdagent already attached");
     g_test_expect_message(G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
-                          "*spice_server_remove_interface*: assertion 'char_device->st != NULL'*");
+                          "*spice_server_remove_interface*: assertion 'char_device->st != nullptr'*");
     vmc_instances[0].base.sif = &vmc_interface.base;
     spice_server_add_interface(test->server, &vmc_instances[0].base);
     vmc_instances[1].base.sif = &vmc_interface.base;
@@ -135,7 +135,7 @@ static void test_duplicate_removal(void)
     int status;
 
     g_test_expect_message(G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
-                          "*spice_server_remove_interface*: assertion 'char_device->st != NULL'*");
+                          "*spice_server_remove_interface*: assertion 'char_device->st != nullptr'*");
     vmc_instance.base.sif = &vmc_interface.base;
     spice_server_add_interface(test->server, &vmc_instance.base);
     status = spice_server_remove_interface(&vmc_instance.base);