Attachment 50538 Details for Bug 37847 – [2/4] Give better diagnostics if --enable-tests=yes is given

[patch] [2/4] Give better diagnostics if --enable-tests=yes is given

0002-Give-better-diagnostics-if-enable-tests-yes-is-given.patch (text/plain), 2.05 KB, created by Simon McVittie on 2011-08-24 05:05:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-08-24 05:05:24 UTC

Size: 2.05 KB

patch

obsolete

>From 65624884cdd92b43a9a25ffd65bcfd4946e69bc4 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Wed, 24 Aug 2011 11:00:35 +0100
>Subject: [PATCH 2/4] Give better diagnostics if --enable-tests=yes is given
>
>We want to indicate why it's a problem that GLib, dbus-glib are missing.
>---
> configure.ac |   15 ++++++++++++---
> 1 files changed, 12 insertions(+), 3 deletions(-)
>
>diff --git a/configure.ac b/configure.ac
>index 3ddad20..de7d5d2 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -163,7 +163,14 @@ AC_ARG_ENABLE([modular-tests],
> AC_ARG_ENABLE([tests],
>   AS_HELP_STRING([--enable-tests],
>     [enable/disable all tests, overriding embedded-tests/modular-tests]),
>-  [enable_embedded_tests=$enableval; enable_modular_tests=$enableval],
>+  [
>+  if test "x$enableval" = xyes; then
>+    AC_MSG_NOTICE([Full test coverage was requested with --enable-tests=yes])
>+    AC_MSG_NOTICE([This has many dependencies (GLib, dbus-glib, Python)])
>+  fi
>+  enable_embedded_tests=$enableval
>+  enable_modular_tests=$enableval
>+  ],
>   [])
> 
> # DBUS_ENABLE_EMBEDDED_TESTS controls unit tests built in to .c files
>@@ -187,7 +194,8 @@ if test "x$enable_modular_tests" != xno; then
>   PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.22, gio-2.0 >= 2.22],
>     [],
>     [if test "x$enable_modular_tests" = xyes; then
>-      AC_MSG_ERROR([GLib is required by the modular tests])
>+      AC_MSG_NOTICE([Full test coverage (--enable-modular-tests=yes or --enable-tests=yes) requires GLib])
>+      AC_MSG_ERROR([$GLIB_ERRORS])
>     else # assumed to be "auto"
>       enable_modular_tests=no
>     fi])
>@@ -195,7 +203,8 @@ if test "x$enable_modular_tests" != xno; then
>   PKG_CHECK_MODULES([DBUS_GLIB], [dbus-glib-1],
>     [],
>     [if test "x$enable_modular_tests" = xyes; then
>-      AC_MSG_ERROR([dbus-glib is required by the modular tests (for now)])
>+      AC_MSG_NOTICE([Full test coverage (--enable-modular-tests=yes or --enable-tests=yes) requires dbus-glib])
>+      AC_MSG_ERROR([$DBUS_GLIB_ERRORS])
>     else # assumed to be "auto"
>       enable_modular_tests=no
>     fi])
>-- 
>1.7.5.4
>

Actions: View | Splinter Review

Attachments on bug 37847: 50537 | 50538 | 50539 | 50540 | 51263

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.