[PATCH weston 2/2] tests: Use&Fix parallel tests

[Giulio Camuffo]

Tested, fixed my odd make check problem with automake 1.13.1.

Giulio

2013/2/21 Quentin Glidic <sardemff7+wayland at sardemff7.net>:
> From: Quentin Glidic <sardemff7+git at sardemff7.net>
>
> Also fix automake 1.13 support
>
> Signed-off-by: Quentin Glidic <sardemff7+git at sardemff7.net>
> ---
>  configure.ac           | 2 +-
>  tests/Makefile.am      | 6 +++---
>  tests/weston-tests-env | 2 ++
>  3 files changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 74eb892..d207ebb 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -18,7 +18,7 @@ AC_SUBST([WESTON_VERSION], [weston_version])
>
>  AC_CONFIG_HEADERS([config.h])
>
> -AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz])
> +AM_INIT_AUTOMAKE([1.11 parallel-tests foreign no-dist-gzip dist-xz])
>
>  AM_SILENT_RULES([yes])
>
> diff --git a/tests/Makefile.am b/tests/Makefile.am
> index 0f81458..3f7aa9e 100644
> --- a/tests/Makefile.am
> +++ b/tests/Makefile.am
> @@ -11,13 +11,13 @@ weston_tests =                              \
>         text-test                       \
>         $(xwayland_test)
>
> -TESTS_ENVIRONMENT = $(SHELL) $(top_srcdir)/tests/weston-tests-env
> +AM_TESTS_ENVIRONMENT = \
> +       abs_builddir="$(abs_builddir)"; export abs_builddir;
> +LOG_COMPILER = $(srcdir)/weston-tests-env
>
>  clean-local:
>         -rm -rf logs
>
> -export abs_builddir
> -
>  noinst_LTLIBRARIES =                   \
>         $(weston_test)
>
> diff --git a/tests/weston-tests-env b/tests/weston-tests-env
> index 159709e..2e5fa95 100755
> --- a/tests/weston-tests-env
> +++ b/tests/weston-tests-env
> @@ -21,12 +21,14 @@ fi
>  case $1 in
>         *.la|*.so)
>                 $WESTON --backend=$BACKEND \
> +                       --socket=test-$(basename $1) \
>                         --modules=$abs_builddir/.libs/${1/.la/.so},xwayland.so \
>                         --log="$SERVERLOG" \
>                         &> "$OUTLOG"
>                 ;;
>         *)
>                 WESTON_TEST_CLIENT_PATH=$abs_builddir/$1 $WESTON \
> +                       --socket=test-$(basename $1) \
>                         --backend=$BACKEND \
>                         --log="$SERVERLOG" \
>                         --modules=$abs_builddir/.libs/weston-test.so,xwayland.so \
> --
> 1.8.1.2
>
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel