[Spice-devel] [PATCH v5 9/9] server/tests: test_util.h: fix double ASSERT definition

[Alon Levy]

On Tue, Jul 19, 2011 at 11:18:39AM +0200, Christophe Fergeau wrote:
> On Tue, Jul 19, 2011 at 11:53:03AM +0300, Alon Levy wrote:
> > ---
> >  server/tests/test_util.h |    3 +++
> >  1 files changed, 3 insertions(+), 0 deletions(-)
> > 
> > diff --git a/server/tests/test_util.h b/server/tests/test_util.h
> > index ac1442d..9844426 100644
> > --- a/server/tests/test_util.h
> > +++ b/server/tests/test_util.h
> > @@ -4,6 +4,9 @@
> >  #define TRUE 1
> >  #define FALSE 0
> >  
> > +#ifdef ASSERT
> > +#undef ASSERT
> > +#endif
> >  #define ASSERT(x) if (!(x)) {                               \
> >      printf("%s: ASSERT %s failed\n", __FUNCTION__, #x);     \
> >      abort();                                                \
> 
> Can't the definition be removed from here?
> 

This patch wasn't supposed to be in this series. Since I forgot the
surface on demand patch and a free in handle_dev_update I'm going to resend anyway,

Still - it's easier to redefine it without the backtrace then adding the
backtrace.o file to the test objects, since for tests I'm going to be running
with libtool --mode=execute cgdb around it anyway.

> Christophe