[PATCH v2 3/4] test: always add DIX_LIB and OS_LIB on XORG builds

[Alan Coopersmith]

Works for me.   (Literally, as I tried building on Solaris with --disable-xorg
and the tests built & ran fine.)

Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
Tested-by: Alan Coopersmith <alan.coopersmith at oracle.com>

Your mileage may vary on the other dtrace-enabled platforms of course.

On 06/20/12 10:42 PM, Peter Hutterer wrote:
> With --disable-xorg, We also disabled a bunch of tests because of their
> perceived reliance on a DDX. The cause was libtool missing some object files
> that never ended up in libxservertest.la. Only the xfree86 test has a true
> dependency on XORG.
> 
> DIX_LIB was pointing to dix.O (instead of libdix.la) when
> DTRACE_SPECIAL_OBJECTS was defined. libdix.la should be part of XSERVER_LIBS
> but dix.O is not a recognised libtool object, so it got skipped for
> libxservertest.a. Only in the XORG case would we add DIX_LIB and OS_LIB
> manually, thus forcing linkage with the dtrace-generated objects.
> 
> Fixing this by packaging up the dtrace-generated files as part of
> libdix.la/libos.la doesn't work for Solaris (and possible others), so simply
> always force linkage against the DIX_LIB/OS_LIB in the case of dtrace objects.
> 
> Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
> ---
> Changes to v1:
> we can't fix the dix/os libtool libraries previously proposed, Solaris
> ends up without probes then. So instead of that, use the existing object
> files but link all test against them.
> 
>  test/Makefile.am |    2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/test/Makefile.am b/test/Makefile.am
> index 1f0e7fa..69e7f8a 100644
> --- a/test/Makefile.am
> +++ b/test/Makefile.am
> @@ -21,11 +21,9 @@ INCLUDES += -I$(top_srcdir)/hw/xfree86/parser \
>  endif
>  TEST_LDADD=libxservertest.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) $(GLX_SYS_LIBS)
>  
> -if XORG
>  if SPECIAL_DTRACE_OBJECTS
>  TEST_LDADD += $(OS_LIB) $(DIX_LIB)
>  endif
> -endif
>  
>  xkb_LDADD=$(TEST_LDADD)
>  input_LDADD=$(TEST_LDADD)


-- 
	-Alan Coopersmith-              alan.coopersmith at oracle.com
	 Oracle Solaris Engineering - http://blogs.oracle.com/alanc