[Spice-devel,spice-common,1/2] log: remove deprecated SPICE_ABORT_LEVEL support

Submitted by Frediano Ziglio on June 13, 2017, 2:47 p.m.

Details

Message ID 20170613144754.30610-2-fziglio@redhat.com
State New
Headers show
Series "Remove obsolete environment usage" ( rev: 1 ) in Spice

Not browsing as part of any series.

Commit Message

Frediano Ziglio June 13, 2017, 2:47 p.m.
This feature was marked obsolete by efd1d3cb4d8eee more than
an year ago.

Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
---
 common/log.c         | 27 ++-------------------------
 tests/test-logging.c | 39 +--------------------------------------
 2 files changed, 3 insertions(+), 63 deletions(-)

Patch hide | download patch | download mbox

diff --git a/common/log.c b/common/log.c
index 92f5bc0..ee13777 100644
--- a/common/log.c
+++ b/common/log.c
@@ -31,7 +31,6 @@ 
 #include "backtrace.h"
 
 static int glib_debug_level = INT_MAX;
-static int abort_mask = 0;
 
 #ifndef SPICE_ABORT_MASK_DEFAULT
 #ifdef SPICE_DISABLE_ABORT
@@ -41,6 +40,8 @@  static int abort_mask = 0;
 #endif
 #endif
 
+static const int abort_mask = SPICE_ABORT_MASK_DEFAULT;
+
 typedef enum {
     SPICE_LOG_LEVEL_ERROR,
     SPICE_LOG_LEVEL_CRITICAL,
@@ -101,29 +102,6 @@  static void spice_log_set_debug_level(void)
     }
 }
 
-static void spice_log_set_abort_level(void)
-{
-    if (abort_mask == 0) {
-        const char *abort_str = g_getenv("SPICE_ABORT_LEVEL");
-        if (abort_str != NULL) {
-            GLogLevelFlags glib_abort_level;
-
-            /* FIXME: To be removed after enough deprecation time */
-            g_warning("Setting SPICE_ABORT_LEVEL is deprecated, use G_DEBUG instead");
-            glib_abort_level = spice_log_level_to_glib(atoi(abort_str));
-            unsigned int fatal_mask = G_LOG_FATAL_MASK;
-            while (glib_abort_level >= G_LOG_LEVEL_ERROR) {
-                fatal_mask |= glib_abort_level;
-                glib_abort_level >>= 1;
-            }
-            abort_mask = fatal_mask;
-            g_log_set_fatal_mask(SPICE_LOG_DOMAIN, fatal_mask);
-        } else {
-            abort_mask = SPICE_ABORT_MASK_DEFAULT;
-        }
-    }
-}
-
 static void spice_logger(const gchar *log_domain,
                          GLogLevelFlags log_level,
                          const gchar *message,
@@ -139,7 +117,6 @@  SPICE_CONSTRUCTOR_FUNC(spice_log_init)
 {
 
     spice_log_set_debug_level();
-    spice_log_set_abort_level();
     g_log_set_handler(SPICE_LOG_DOMAIN,
                       G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL | G_LOG_FLAG_RECURSION,
                       spice_logger, NULL);
diff --git a/tests/test-logging.c b/tests/test-logging.c
index f1ad1b6..c871648 100644
--- a/tests/test-logging.c
+++ b/tests/test-logging.c
@@ -45,37 +45,6 @@  LOG_OTHER_HELPER(warning, WARNING)
 LOG_OTHER_HELPER(critical, CRITICAL)
 
 #if GLIB_CHECK_VERSION(2,38,0)
-/* Checks that spice_warning() aborts after changing SPICE_ABORT_LEVEL */
-static void test_spice_abort_level(void)
-{
-    if (g_test_subprocess()) {
-        spice_warning("spice_warning");
-        return;
-    }
-    /* 2 = SPICE_LOG_LEVEL_WARNING  */
-    g_setenv("SPICE_ABORT_LEVEL", "2", TRUE);
-    g_test_trap_subprocess(NULL, 0, 0);
-    g_unsetenv("SPICE_ABORT_LEVEL");
-    g_test_trap_assert_failed();
-    g_test_trap_assert_stderr("*SPICE_ABORT_LEVEL*deprecated*");
-    g_test_trap_assert_stderr("*spice_warning*");
-}
-
-/* Checks that g_warning() aborts after changing SPICE_ABORT_LEVEL */
-static void test_spice_abort_level_g_warning(void)
-{
-    if (g_test_subprocess()) {
-        g_warning("g_warning");
-        return;
-    }
-    g_setenv("SPICE_ABORT_LEVEL", "2", TRUE);
-    g_test_trap_subprocess(NULL, 0, 0);
-    g_unsetenv("SPICE_ABORT_LEVEL");
-    g_test_trap_assert_failed();
-    g_test_trap_assert_stderr("*SPICE_ABORT_LEVEL*deprecated*");
-    g_test_trap_assert_stderr("*g_warning*");
-}
-
 /* Checks that spice_warning() aborts after setting G_DEBUG=fatal-warnings */
 static void test_spice_fatal_warning(void)
 {
@@ -287,7 +256,6 @@  static void test_spice_debug_level_warning(void)
         spice_info("spice_info");
         spice_debug("spice_debug");
         spice_warning("spice_warning");
-        spice_critical("spice_critical");
         g_debug("g_debug");
         g_info("g_info");
         g_message("g_message");
@@ -302,15 +270,12 @@  static void test_spice_debug_level_warning(void)
         return;
     }
 
-    g_setenv("SPICE_ABORT_LEVEL", "0", TRUE);
     g_setenv("SPICE_DEBUG_LEVEL", "1", TRUE);
     g_test_trap_subprocess(NULL, 0, 0);
-    g_unsetenv("SPICE_ABORT_LEVEL");
     g_unsetenv("SPICE_DEBUG_LEVEL");
     g_test_trap_assert_passed();
     g_test_trap_assert_stderr("*SPICE_DEBUG_LEVEL*deprecated*");
-    g_test_trap_assert_stderr("*SPICE_ABORT_LEVEL*deprecated*");
-    g_test_trap_assert_stderr("*spice_critical\n*g_critical\n*other_message\n*other_warning\n*other_critical\n");
+    g_test_trap_assert_stderr("*g_critical\n*other_message\n*other_warning\n*other_critical\n");
 }
 
 /* Checks that setting G_MESSAGES_DEBUG to 'Spice' impacts spice_debug() and
@@ -387,8 +352,6 @@  int main(int argc, char **argv)
     g_log_set_always_fatal(fatal_mask & G_LOG_LEVEL_MASK);
 
 #if GLIB_CHECK_VERSION(2,38,0)
-    g_test_add_func("/spice-common/spice-abort-level", test_spice_abort_level);
-    g_test_add_func("/spice-common/spice-abort-level-gwarning", test_spice_abort_level_g_warning);
     g_test_add_func("/spice-common/spice-debug-level", test_spice_debug_level);
     g_test_add_func("/spice-common/spice-debug-level-warning", test_spice_debug_level_warning);
     g_test_add_func("/spice-common/spice-g-messages-debug", test_spice_g_messages_debug);

Comments

On Tue, Jun 13, 2017 at 03:47:53PM +0100, Frediano Ziglio wrote:
> This feature was marked obsolete by efd1d3cb4d8eee more than
> an year ago.

How many stable releases has this been in? How many distros have been
shipping said stable releases, for how long?

(rethorical questions, the answer is 0).

Christophe
> 
> On Tue, Jun 13, 2017 at 03:47:53PM +0100, Frediano Ziglio wrote:
> > This feature was marked obsolete by efd1d3cb4d8eee more than
> > an year ago.
> 
> How many stable releases has this been in? How many distros have been
> shipping said stable releases, for how long?
> 
> (rethorical questions, the answer is 0).
> 
> Christophe
> 

Why a rethorical question?
I was reading Victor comment on the three releases, don't actually
remember the releases. Then I open the link and see the age of the
comment.
By the way Fedora 25 had this code for 6 months so this count at
least as 1 stable release.
Not that 1 is usually enough, usually you want at least one release
stating the deprecation and remove on the next.

Frediano
Hi,

On Tue, Jun 13, 2017 at 06:31:38PM +0200, Christophe Fergeau wrote:
> On Tue, Jun 13, 2017 at 03:47:53PM +0100, Frediano Ziglio wrote:
> > This feature was marked obsolete by efd1d3cb4d8eee more than
> > an year ago.
>
> How many stable releases has this been in?

* Spice-gtk: v0.31, v0.32, v0.33 and I propose v0.34 as final.

  commit cc8adb63ee5b9a554b9e237f825741cf4fcc2c09
  Author: Marc-André Lureau <marcandre.lureau@gmail.com>
  Date:   Thu Mar 10 17:05:20 2016 +0100

      Update spice-common submodule

But I guess you mean spice-server. That's annoying.

  commit b206efb30bf41cb2e071f75cee87901cad1c83b7
  Author: Frediano Ziglio <fziglio@redhat.com>
  Date:   Tue Feb 2 12:47:40 2016 +0000

      Update spice-common

      Needed to have the updated spice_marshaller_get_fd function

(wingsuit) spice (master 5dc55aa7) $ git describe --contains b206efb30b
v0.13.1~192

> How many distros have been shipping said stable releases, for how
> long?
>
> (rethorical questions, the answer is 0).

Stable releases in spice, I see. IMHO, we should consider 0.13.1 for
that. Stable releases in spice-server take too long.

    toso
On Wed, 2017-06-14 at 12:00 +0200, Victor Toso wrote:
> Hi,
> 
> On Tue, Jun 13, 2017 at 06:31:38PM +0200, Christophe Fergeau wrote:
> > On Tue, Jun 13, 2017 at 03:47:53PM +0100, Frediano Ziglio wrote:
> > > This feature was marked obsolete by efd1d3cb4d8eee more than
> > > an year ago.
> > 
> > How many stable releases has this been in?
> 
> * Spice-gtk: v0.31, v0.32, v0.33 and I propose v0.34 as final.
> 
>   commit cc8adb63ee5b9a554b9e237f825741cf4fcc2c09
>   Author: Marc-André Lureau <marcandre.lureau@gmail.com>
>   Date:   Thu Mar 10 17:05:20 2016 +0100
> 
>       Update spice-common submodule

Unfortunately, these environment variables never really applied to
spice-gtk (even though it was ostensibly supposed to be a "common"
logging implementation). As I stated in a different email, defining
SPICE_DEBUG_LEVEL only enables debugging for the "Spice" domain, which
is not used by spice-gtk ("GSpice" is the spice-gtk domain). In theory,
SPICE_ABORT_LEVEL could affect spice-gtk, but only if spice-gtk calls
spice_log(), which it generally doesn't. spice-gtk implements its own
SPICE_DEBUG() macro that doesn't use spice_log(). So whether this
variable is kept or removed will not really affect spice-gtk at all.


> 
> But I guess you mean spice-server. That's annoying.
> 
>   commit b206efb30bf41cb2e071f75cee87901cad1c83b7
>   Author: Frediano Ziglio <fziglio@redhat.com>
>   Date:   Tue Feb 2 12:47:40 2016 +0000
> 
>       Update spice-common
> 
>       Needed to have the updated spice_marshaller_get_fd function
> 
> (wingsuit) spice (master 5dc55aa7) $ git describe --contains
> b206efb30b
> v0.13.1~192
> 
> > How many distros have been shipping said stable releases, for how
> > long?
> > 
> > (rethorical questions, the answer is 0).
> 
> Stable releases in spice, I see. IMHO, we should consider 0.13.1 for
> that. Stable releases in spice-server take too long.
> 

Yeah, I agree we probably need a new spice-server release soon.

Jonathon
> 
> On Wed, 2017-06-14 at 12:00 +0200, Victor Toso wrote:
> > Hi,
> > 
> > On Tue, Jun 13, 2017 at 06:31:38PM +0200, Christophe Fergeau wrote:
> > > On Tue, Jun 13, 2017 at 03:47:53PM +0100, Frediano Ziglio wrote:
> > > > This feature was marked obsolete by efd1d3cb4d8eee more than
> > > > an year ago.
> > > 
> > > How many stable releases has this been in?
> > 
> > * Spice-gtk: v0.31, v0.32, v0.33 and I propose v0.34 as final.
> > 
> >   commit cc8adb63ee5b9a554b9e237f825741cf4fcc2c09
> >   Author: Marc-André Lureau <marcandre.lureau@gmail.com>
> >   Date:   Thu Mar 10 17:05:20 2016 +0100
> > 
> >       Update spice-common submodule
> 
> Unfortunately, these environment variables never really applied to
> spice-gtk (even though it was ostensibly supposed to be a "common"
> logging implementation). As I stated in a different email, defining
> SPICE_DEBUG_LEVEL only enables debugging for the "Spice" domain, which
> is not used by spice-gtk ("GSpice" is the spice-gtk domain). In theory,
> SPICE_ABORT_LEVEL could affect spice-gtk, but only if spice-gtk calls
> spice_log(), which it generally doesn't. spice-gtk implements its own
> SPICE_DEBUG() macro that doesn't use spice_log(). So whether this
> variable is kept or removed will not really affect spice-gtk at all.
> 

Not 100% correct. spice-gtk is using spice-common but not defining
SPICE_LOG_DOMAIN and the default is "Spice". So the log calls to
spice_XXX from spice-common code used by spice-gtk are using the
spice_log path.

> 
> > 
> > But I guess you mean spice-server. That's annoying.
> > 
> >   commit b206efb30bf41cb2e071f75cee87901cad1c83b7
> >   Author: Frediano Ziglio <fziglio@redhat.com>
> >   Date:   Tue Feb 2 12:47:40 2016 +0000
> > 
> >       Update spice-common
> > 
> >       Needed to have the updated spice_marshaller_get_fd function
> > 
> > (wingsuit) spice (master 5dc55aa7) $ git describe --contains
> > b206efb30b
> > v0.13.1~192
> > 
> > > How many distros have been shipping said stable releases, for how
> > > long?
> > > 
> > > (rethorical questions, the answer is 0).
> > 
> > Stable releases in spice, I see. IMHO, we should consider 0.13.1 for
> > that. Stable releases in spice-server take too long.
> > 
> 
> Yeah, I agree we probably need a new spice-server release soon.
> 
> Jonathon

Frediano
On Wed, Jun 14, 2017 at 10:40:27AM -0500, Jonathon Jongsma wrote:
> > Stable releases in spice, I see. IMHO, we should consider 0.13.1 for
> > that. Stable releases in spice-server take too long.
> > 
> 
> Yeah, I agree we probably need a new spice-server release soon.
> 

Yup, I've been saying for months I'd be working on a release, and
kept not doing it /o\ I was thinking of just tagging 0.14.0 (or 0.13.90,
with 0.14.0 coming out in a few weeks) given that this has been maturing
for a while, and the amount of changes has slowed down lately.

Christophe

> Jonathon
On Wed, 2017-06-14 at 11:51 -0400, Frediano Ziglio wrote:
> > 
> > On Wed, 2017-06-14 at 12:00 +0200, Victor Toso wrote:
> > > Hi,
> > > 
> > > On Tue, Jun 13, 2017 at 06:31:38PM +0200, Christophe Fergeau
> > > wrote:
> > > > On Tue, Jun 13, 2017 at 03:47:53PM +0100, Frediano Ziglio
> > > > wrote:
> > > > > This feature was marked obsolete by efd1d3cb4d8eee more than
> > > > > an year ago.
> > > > 
> > > > How many stable releases has this been in?
> > > 
> > > * Spice-gtk: v0.31, v0.32, v0.33 and I propose v0.34 as final.
> > > 
> > >   commit cc8adb63ee5b9a554b9e237f825741cf4fcc2c09
> > >   Author: Marc-André Lureau <marcandre.lureau@gmail.com>
> > >   Date:   Thu Mar 10 17:05:20 2016 +0100
> > > 
> > >       Update spice-common submodule
> > 
> > Unfortunately, these environment variables never really applied to
> > spice-gtk (even though it was ostensibly supposed to be a "common"
> > logging implementation). As I stated in a different email, defining
> > SPICE_DEBUG_LEVEL only enables debugging for the "Spice" domain,
> > which
> > is not used by spice-gtk ("GSpice" is the spice-gtk domain). In
> > theory,
> > SPICE_ABORT_LEVEL could affect spice-gtk, but only if spice-gtk
> > calls
> > spice_log(), which it generally doesn't. spice-gtk implements its
> > own
> > SPICE_DEBUG() macro that doesn't use spice_log(). So whether this
> > variable is kept or removed will not really affect spice-gtk at
> > all.
> > 
> 
> Not 100% correct. spice-gtk is using spice-common but not defining
> SPICE_LOG_DOMAIN and the default is "Spice". So the log calls to
> spice_XXX from spice-common code used by spice-gtk are using the
> spice_log path.

Good point. In practice this doesn't actually log much debug-level
information at all, though. And since spice-gtk defines
SPICE_DISABLE_ABORT in its Makefile, the SPICE_ABORT_LEVEL is not
really applicable to spice-gtk.

Jonathon
Hi

----- Original Message -----
> > 
> > On Wed, 2017-06-14 at 12:00 +0200, Victor Toso wrote:
> > > Hi,
> > > 
> > > On Tue, Jun 13, 2017 at 06:31:38PM +0200, Christophe Fergeau wrote:
> > > > On Tue, Jun 13, 2017 at 03:47:53PM +0100, Frediano Ziglio wrote:
> > > > > This feature was marked obsolete by efd1d3cb4d8eee more than
> > > > > an year ago.
> > > > 
> > > > How many stable releases has this been in?
> > > 
> > > * Spice-gtk: v0.31, v0.32, v0.33 and I propose v0.34 as final.
> > > 
> > >   commit cc8adb63ee5b9a554b9e237f825741cf4fcc2c09
> > >   Author: Marc-André Lureau <marcandre.lureau@gmail.com>
> > >   Date:   Thu Mar 10 17:05:20 2016 +0100
> > > 
> > >       Update spice-common submodule
> > 
> > Unfortunately, these environment variables never really applied to
> > spice-gtk (even though it was ostensibly supposed to be a "common"
> > logging implementation). As I stated in a different email, defining
> > SPICE_DEBUG_LEVEL only enables debugging for the "Spice" domain, which
> > is not used by spice-gtk ("GSpice" is the spice-gtk domain). In theory,
> > SPICE_ABORT_LEVEL could affect spice-gtk, but only if spice-gtk calls
> > spice_log(), which it generally doesn't. spice-gtk implements its own
> > SPICE_DEBUG() macro that doesn't use spice_log(). So whether this
> > variable is kept or removed will not really affect spice-gtk at all.
> > 
> 
> Not 100% correct. spice-gtk is using spice-common but not defining
> SPICE_LOG_DOMAIN and the default is "Spice". So the log calls to
> spice_XXX from spice-common code used by spice-gtk are using the
> spice_log path.

Right, additionally, spice-gtk used has SPICE_DISABLE_ABORT although it was probably made useless since commit 05a203af120016 (that's a while ago)
Hi

----- Original Message -----
> This feature was marked obsolete by efd1d3cb4d8eee more than
> an year ago.
> 
> Signed-off-by: Frediano Ziglio <fziglio@redhat.com>

I suggest a follow-up patch to remove all #if SPICE_DISABLE_ABORT handling (I sent a patch to spice-gtk since it seems useless there)

> ---
>  common/log.c         | 27 ++-------------------------
>  tests/test-logging.c | 39 +--------------------------------------
>  2 files changed, 3 insertions(+), 63 deletions(-)
> 
> diff --git a/common/log.c b/common/log.c
> index 92f5bc0..ee13777 100644
> --- a/common/log.c
> +++ b/common/log.c
> @@ -31,7 +31,6 @@
>  #include "backtrace.h"
>  
>  static int glib_debug_level = INT_MAX;
> -static int abort_mask = 0;
>  
>  #ifndef SPICE_ABORT_MASK_DEFAULT
>  #ifdef SPICE_DISABLE_ABORT
> @@ -41,6 +40,8 @@ static int abort_mask = 0;
>  #endif
>  #endif
>  
> +static const int abort_mask = SPICE_ABORT_MASK_DEFAULT;
> +
>  typedef enum {
>      SPICE_LOG_LEVEL_ERROR,
>      SPICE_LOG_LEVEL_CRITICAL,
> @@ -101,29 +102,6 @@ static void spice_log_set_debug_level(void)
>      }
>  }
>  
> -static void spice_log_set_abort_level(void)
> -{
> -    if (abort_mask == 0) {
> -        const char *abort_str = g_getenv("SPICE_ABORT_LEVEL");
> -        if (abort_str != NULL) {
> -            GLogLevelFlags glib_abort_level;
> -
> -            /* FIXME: To be removed after enough deprecation time */
> -            g_warning("Setting SPICE_ABORT_LEVEL is deprecated, use G_DEBUG
> instead");
> -            glib_abort_level = spice_log_level_to_glib(atoi(abort_str));
> -            unsigned int fatal_mask = G_LOG_FATAL_MASK;
> -            while (glib_abort_level >= G_LOG_LEVEL_ERROR) {
> -                fatal_mask |= glib_abort_level;
> -                glib_abort_level >>= 1;
> -            }
> -            abort_mask = fatal_mask;
> -            g_log_set_fatal_mask(SPICE_LOG_DOMAIN, fatal_mask);
> -        } else {
> -            abort_mask = SPICE_ABORT_MASK_DEFAULT;
> -        }
> -    }
> -}
> -
>  static void spice_logger(const gchar *log_domain,
>                           GLogLevelFlags log_level,
>                           const gchar *message,
> @@ -139,7 +117,6 @@ SPICE_CONSTRUCTOR_FUNC(spice_log_init)
>  {
>  
>      spice_log_set_debug_level();
> -    spice_log_set_abort_level();
>      g_log_set_handler(SPICE_LOG_DOMAIN,
>                        G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL |
>                        G_LOG_FLAG_RECURSION,
>                        spice_logger, NULL);
> diff --git a/tests/test-logging.c b/tests/test-logging.c
> index f1ad1b6..c871648 100644
> --- a/tests/test-logging.c
> +++ b/tests/test-logging.c
> @@ -45,37 +45,6 @@ LOG_OTHER_HELPER(warning, WARNING)
>  LOG_OTHER_HELPER(critical, CRITICAL)
>  
>  #if GLIB_CHECK_VERSION(2,38,0)
> -/* Checks that spice_warning() aborts after changing SPICE_ABORT_LEVEL */
> -static void test_spice_abort_level(void)
> -{
> -    if (g_test_subprocess()) {
> -        spice_warning("spice_warning");
> -        return;
> -    }
> -    /* 2 = SPICE_LOG_LEVEL_WARNING  */
> -    g_setenv("SPICE_ABORT_LEVEL", "2", TRUE);
> -    g_test_trap_subprocess(NULL, 0, 0);
> -    g_unsetenv("SPICE_ABORT_LEVEL");
> -    g_test_trap_assert_failed();
> -    g_test_trap_assert_stderr("*SPICE_ABORT_LEVEL*deprecated*");
> -    g_test_trap_assert_stderr("*spice_warning*");
> -}
> -
> -/* Checks that g_warning() aborts after changing SPICE_ABORT_LEVEL */
> -static void test_spice_abort_level_g_warning(void)
> -{
> -    if (g_test_subprocess()) {
> -        g_warning("g_warning");
> -        return;
> -    }
> -    g_setenv("SPICE_ABORT_LEVEL", "2", TRUE);
> -    g_test_trap_subprocess(NULL, 0, 0);
> -    g_unsetenv("SPICE_ABORT_LEVEL");
> -    g_test_trap_assert_failed();
> -    g_test_trap_assert_stderr("*SPICE_ABORT_LEVEL*deprecated*");
> -    g_test_trap_assert_stderr("*g_warning*");
> -}
> -
>  /* Checks that spice_warning() aborts after setting G_DEBUG=fatal-warnings
>  */
>  static void test_spice_fatal_warning(void)
>  {
> @@ -287,7 +256,6 @@ static void test_spice_debug_level_warning(void)
>          spice_info("spice_info");
>          spice_debug("spice_debug");
>          spice_warning("spice_warning");
> -        spice_critical("spice_critical");
>          g_debug("g_debug");
>          g_info("g_info");
>          g_message("g_message");
> @@ -302,15 +270,12 @@ static void test_spice_debug_level_warning(void)
>          return;
>      }
>  
> -    g_setenv("SPICE_ABORT_LEVEL", "0", TRUE);
>      g_setenv("SPICE_DEBUG_LEVEL", "1", TRUE);
>      g_test_trap_subprocess(NULL, 0, 0);
> -    g_unsetenv("SPICE_ABORT_LEVEL");
>      g_unsetenv("SPICE_DEBUG_LEVEL");
>      g_test_trap_assert_passed();
>      g_test_trap_assert_stderr("*SPICE_DEBUG_LEVEL*deprecated*");
> -    g_test_trap_assert_stderr("*SPICE_ABORT_LEVEL*deprecated*");
> -
> g_test_trap_assert_stderr("*spice_critical\n*g_critical\n*other_message\n*other_warning\n*other_critical\n");
> +
> g_test_trap_assert_stderr("*g_critical\n*other_message\n*other_warning\n*other_critical\n");
>  }
>  
>  /* Checks that setting G_MESSAGES_DEBUG to 'Spice' impacts spice_debug() and
> @@ -387,8 +352,6 @@ int main(int argc, char **argv)
>      g_log_set_always_fatal(fatal_mask & G_LOG_LEVEL_MASK);
>  
>  #if GLIB_CHECK_VERSION(2,38,0)
> -    g_test_add_func("/spice-common/spice-abort-level",
> test_spice_abort_level);
> -    g_test_add_func("/spice-common/spice-abort-level-gwarning",
> test_spice_abort_level_g_warning);
>      g_test_add_func("/spice-common/spice-debug-level",
>      test_spice_debug_level);
>      g_test_add_func("/spice-common/spice-debug-level-warning",
>      test_spice_debug_level_warning);
>      g_test_add_func("/spice-common/spice-g-messages-debug",
>      test_spice_g_messages_debug);
> --
> 2.9.4
> 
> _______________________________________________
> Spice-devel mailing list
> Spice-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/spice-devel
>