[Spice-devel] [PATCH spice-server v2 10/15] test-display-base: Always compile with AUTOMATED_TESTS enabled

[Christophe Fergeau]

Acked-by: Christophe Fergeau <cfergeau at redhat.com>

On Wed, Sep 06, 2017 at 05:26:54PM +0100, Frediano Ziglio wrote:
> There's no need to not compile this feature, it just enable
> a parameters which must be passed in order to change test
> behaviour.
> 
> Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
> ---
>  configure.ac                     | 17 -----------------
>  server/tests/Makefile.am         |  4 ----
>  server/tests/test-display-base.c |  6 ------
>  3 files changed, 27 deletions(-)
> 
> Changes since v1:
> - remove configure stuff.
> 
> diff --git a/configure.ac b/configure.ac
> index 7d8afd572..483dbfdf8 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -122,12 +122,6 @@ if test "x$have_gstreamer_0_10" = "xyes" || test "x$have_gstreamer_1_0" = "xyes"
>      AC_SUBST(ORC_LIBS)
>  fi
>  
> -AC_ARG_ENABLE([automated_tests],
> -              AS_HELP_STRING([--enable-automated-tests], [Enable automated tests using spicy-screenshot (part of spice-gtk)]),,
> -              [enable_automated_tests="no"])
> -AS_IF([test x"$enable_automated_tests" != "xno"], [enable_automated_tests="yes"])
> -AM_CONDITIONAL(HAVE_AUTOMATED_TESTS, test "x$enable_automated_tests" != "xno")
> -
>  dnl Check for the presence of Valgrind and do the plumbing to allow
>  dnl the running of "make check-valgrind".
>  AX_VALGRIND_DFLT(memcheck, on)
> @@ -214,16 +208,6 @@ AC_SUBST(JPEG_LIBS)
>  AC_CHECK_LIB(z, deflate, Z_LIBS='-lz', AC_MSG_ERROR([zlib not found]))
>  AC_SUBST(Z_LIBS)
>  
> -if test "x$enable_automated_tests" = "xyes"; then
> -    AC_MSG_CHECKING([for spicy-screenshot])
> -    spicy-screenshot --help >/dev/null 2>&1
> -    if test $? -ne 0 ; then
> -        AC_MSG_RESULT([not found])
> -        AC_MSG_ERROR([spicy-screenshot was not found, this module is part of spice-gtk and is required to compile this package])
> -    fi
> -    AC_MSG_RESULT([found])
> -fi
> -
>  
>  AC_ARG_ENABLE([manual],
>                 AS_HELP_STRING([--enable-manual=@<:@auto/yes/no@:>@],
> @@ -327,7 +311,6 @@ AC_MSG_NOTICE([
>          Smartcard:                ${have_smartcard}
>          GStreamer:                ${enable_gstreamer}
>          SASL support:             ${have_sasl}
> -        Automated tests:          ${enable_automated_tests}
>          Manual:                   ${have_asciidoc}
>  
>          Now type 'make' to build $PACKAGE
> diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am
> index 17414f657..b64add5f5 100644
> --- a/server/tests/Makefile.am
> +++ b/server/tests/Makefile.am
> @@ -24,10 +24,6 @@ AM_CPPFLAGS =					\
>  	$(WARN_CFLAGS)				\
>  	$(NULL)
>  
> -if HAVE_AUTOMATED_TESTS
> -AM_CPPFLAGS += -DAUTOMATED_TESTS
> -endif
> -
>  noinst_LIBRARIES = libtest.a
>  
>  libtest_a_SOURCES =				\
> diff --git a/server/tests/test-display-base.c b/server/tests/test-display-base.c
> index 768b8986f..e27dcf951 100644
> --- a/server/tests/test-display-base.c
> +++ b/server/tests/test-display-base.c
> @@ -948,11 +948,7 @@ static void init_automated(void)
>  static __attribute__((noreturn))
>  void usage(const char *argv0, const int exitcode)
>  {
> -#ifdef AUTOMATED_TESTS
>      const char *autoopt=" [--automated-tests]";
> -#else
> -    const char *autoopt="";
> -#endif
>  
>      printf("usage: %s%s\n", argv0, autoopt);
>      exit(exitcode);
> @@ -961,9 +957,7 @@ void usage(const char *argv0, const int exitcode)
>  void spice_test_config_parse_args(int argc, char **argv)
>  {
>      struct option options[] = {
> -#ifdef AUTOMATED_TESTS
>          {"automated-tests", no_argument, &has_automated_tests, 1},
> -#endif
>          {NULL, 0, NULL, 0},
>      };
>      int option_index;
> -- 
> 2.13.5
> 
> _______________________________________________
> Spice-devel mailing list
> Spice-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/spice-devel