[totem-pl-parser] tests: Fix distcheck tests
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [totem-pl-parser] tests: Fix distcheck tests
- Date: Tue, 17 Feb 2015 14:35:09 +0000 (UTC)
commit e0a27de154259c8e11dd8eff1b606c9e6d162502
Author: Bastien Nocera <hadess hadess net>
Date: Tue Feb 17 15:25:09 2015 +0100
tests: Fix distcheck tests
The videosite helper wasn't installed yet, so all calls to it failed,
making our special case in the RSS parsing fail.
https://bugzilla.gnome.org/show_bug.cgi?id=705358
Makefile.am | 2 +-
configure.ac | 14 ++++++++++++++
plparse/totem-pl-parser-videosite.c | 4 ++++
3 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 18bd1f5..a9cda79 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,7 +44,7 @@ MAINTAINERCLEANFILES = \
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = totem-plparser.pc totem-plparser-mini.pc
-DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --enable-gtk-doc --enable-introspection
+DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --enable-gtk-doc --enable-introspection
--enable-uninstalled-tests
# Build ChangeLog from GIT history
ChangeLog:
diff --git a/configure.ac b/configure.ac
index 62d5986..f241723 100644
--- a/configure.ac
+++ b/configure.ac
@@ -174,6 +174,20 @@ if test "x$enable_libgcrypt" != "xno" ; then
fi
fi
+############################
+# Checking uninstalled tests
+############################
+
+AC_ARG_ENABLE(uninstalled-tests,
+ AS_HELP_STRING([--enable-uninstalled-tests],
+ [Uninstalled tests (default is no).]),
+ [],
+ [enable_uninstalled_tests=no])
+if test "x$enable_uninstalled_tests" != "xno" ; then
+ AC_DEFINE(UNINSTALLED_TESTS, 1, [Uninstalled tests])
+fi
+
+
dnl Check for packages for building libtotem-plparser.la
PKG_CHECK_MODULES(TOTEM_PLPARSER, [$pkg_modules])
AC_SUBST(TOTEM_PLPARSER_CFLAGS)
diff --git a/plparse/totem-pl-parser-videosite.c b/plparse/totem-pl-parser-videosite.c
index 743ef7f..6a6a3bd 100644
--- a/plparse/totem-pl-parser-videosite.c
+++ b/plparse/totem-pl-parser-videosite.c
@@ -35,7 +35,11 @@ totem_pl_parser_is_videosite (const char *uri, gboolean debug)
{
#ifdef HAVE_QUVI
const char *args[] = {
+#ifdef UNINSTALLED_TESTS
+ "../totem-pl-parser-videosite",
+#else
LIBEXECDIR "/totem-pl-parser-videosite",
+#endif
"--check",
"--url",
NULL,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]