[PATCH 4/6] Don't require ld -wrap for tests that don't need it

Peter Hutterer peter.hutterer at who-t.net
Sun Oct 30 15:19:10 PDT 2011


On Sat, Oct 29, 2011 at 12:36:53AM -0700, Jeremy Huddleston wrote:
> Reviewed-by: Jeremy Huddleston <jeremyhu at apple.com>
> 
> Why does xi2 "need" -wrap?  Can we do these tests in a more portable way
> with some clever macros?

It'd be easier to just disable the tests on the platforms that don't have
-wrap. The last thing we need is making tests harder to write.

> On Oct 28, 2011, at 17:34, Alan Coopersmith wrote:
> 
> > Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
> > ---
> > test/Makefile.am |    2 --
> > 1 files changed, 0 insertions(+), 2 deletions(-)
> > 
> > diff --git a/test/Makefile.am b/test/Makefile.am
> > index 6c6ca9a..6da1af6 100644
> > --- a/test/Makefile.am
> > +++ b/test/Makefile.am
> > @@ -1,5 +1,4 @@
> > if ENABLE_UNIT_TESTS
> > -if HAVE_LD_WRAP
> > SUBDIRS= . xi2
> > noinst_PROGRAMS = xkb input xtest list misc fixes xfree86
> > check_LTLIBRARIES = libxservertest.la
> > @@ -44,4 +43,3 @@ libxservertest_la_LIBADD = \
> >             @XORG_LIBS@
> > libxservertest_la_DEPENDENCIES = $(libxservertest_la_LIBADD)
> > endif
> > -endif
> > -- 
> > 1.7.3.2

all but one test in xi2 needs -wrap, but I don't see any other check there.

Cheers,
  Peter


More information about the xorg-devel mailing list