[PATCH v2, rebase] wayland: Add --with-tests-environment option to configure

[Kristian Høgsberg]

On Mon, May 14, 2012 at 11:41 AM, U. Artie Eoff
<ullysses.a.eoff at intel.com> wrote:
> From: "U. Artie Eoff" <ullysses.a.eoff at intel.com>
>
> The --with-tests-environment allows one to specify a custom tests
> environment script.  This is useful for customizing and/or
> normalizing test result output to whatever format necessary
> (e.g. xml).

I just realized (reading the generated Makefile) that you can just
override TESTS_ENVIRONMENT on the make command line:

 $ make check TESTS_ENVIRONMENT=true

will make all the tests pass, for example.

Kristian

> Signed-off-by: U. Artie Eoff <ullysses.a.eoff at intel.com>
> ---
>  configure.ac      |    7 +++++++
>  tests/Makefile.am |    6 ++++++
>  2 files changed, 13 insertions(+), 0 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 63081e1..3dedc5a 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -76,6 +76,13 @@ if test "x$enable_documentation" = "xyes"; then
>  fi
>  AM_CONDITIONAL([HAVE_PUBLICAN], [test "x$PUBLICAN" != "x"])
>
> +AC_ARG_WITH(tests-environment, AS_HELP_STRING([--with-tests-environment=PATH],
> +       [Absolute path to user supplied custom tests environment]), [TESTS_ENVIRONMENT_PATH="$withval"],
> +       [])
> +AC_SUBST([TESTS_ENVIRONMENT_PATH])
> +AM_CONDITIONAL(HAVE_CUSTOM_TESTS_ENVIRONMENT,
> +       test x$TESTS_ENVIRONMENT_PATH != x)
> +
>  AC_CONFIG_FILES([Makefile
>                 wayland-scanner.m4
>                 doc/Makefile
> diff --git a/tests/Makefile.am b/tests/Makefile.am
> index 9fdf040..e2f3eb7 100644
> --- a/tests/Makefile.am
> +++ b/tests/Makefile.am
> @@ -16,6 +16,12 @@ check_PROGRAMS =                             \
>  noinst_PROGRAMS =                              \
>        fixed-benchmark
>
> +if HAVE_CUSTOM_TESTS_ENVIRONMENT
> +TESTS_ENVIRONMENT = @TESTS_ENVIRONMENT_PATH@
> +endif
> +
> +export abs_builddir
> +
>  test_runner_src = test-runner.c test-runner.h test-helpers.c
>
>  sanity_test_SOURCES = sanity-test.c $(test_runner_src)
> --
> 1.7.7.6
>
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel