[PATCH] test: when unit tests are enabled, build them during "make"

[Dan Nicholson]

On Tue, Mar 22, 2011 at 8:13 PM, Peter Hutterer
<peter.hutterer at who-t.net> wrote:
> Catch compiler errors that were otherwise only spotted on make check.
>
> Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
> ---
>  test/Makefile.am     |    4 ++--
>  test/xi2/Makefile.am |    4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/test/Makefile.am b/test/Makefile.am
> index be54e5f..ee9b176 100644
> --- a/test/Makefile.am
> +++ b/test/Makefile.am
> @@ -1,9 +1,9 @@
>  if UNITTESTS
>  SUBDIRS= . xi2
> -check_PROGRAMS = xkb input xtest list
> +noinst_PROGRAMS = xkb input xtest list
>  check_LTLIBRARIES = libxservertest.la
>
> -TESTS=$(check_PROGRAMS)
> +TESTS=$(noinst_PROGRAMS)
>
>  AM_CFLAGS = $(DIX_CFLAGS) $(GLIB_CFLAGS) @XORG_CFLAGS@
>  INCLUDES = @XORG_INCS@
> diff --git a/test/xi2/Makefile.am b/test/xi2/Makefile.am
> index d8dc7e9..7f2155d 100644
> --- a/test/xi2/Makefile.am
> +++ b/test/xi2/Makefile.am
> @@ -1,5 +1,5 @@
>  if UNITTESTS
> -check_PROGRAMS =  \
> +noinst_PROGRAMS =  \
>        protocol-xiqueryversion \
>        protocol-xiquerydevice \
>        protocol-xiselectevents \
> @@ -10,7 +10,7 @@ check_PROGRAMS =  \
>         protocol-xiwarppointer \
>         protocol-eventconvert
>
> -TESTS=$(check_PROGRAMS)
> +TESTS=$(noinst_PROGRAMS)
>
>  AM_CFLAGS = $(DIX_CFLAGS) $(GLIB_CFLAGS) @XORG_CFLAGS@
>  INCLUDES = @XORG_INCS@

Fair enough.

Reviewed-by: Dan Nicholson <dbn.lists at gmail.com>