2009-03-30 Tollef Fog Heen <tfheen@err.no>

	* check/common: Add support for non-zero return codes to test
	framework.  Thanks to Loïc Minier for the idea.

diff --git a/ChangeLog b/ChangeLog
index 7d86de5c3cf4254379b308572993426facb45394..c84b1ed87e7a901e35c8de36c1dffed78d8380b5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-03-30  Tollef Fog Heen  <tfheen@err.no>
 
+       * check/common: Add support for non-zero return codes to test
+       framework.  Thanks to Loïc Minier for the idea.
+
        * pkg.m4: Add PKG_CONFIG_PATH and PKG_CONFIG_LIBDIR to the list of
        precious directories.  (AC_ARG_VAR)
 

diff --git a/check/common b/check/common
index 2300e4e3dee3915c7b2886b0de57c1e89b03b5b8..d527f52c7b1c0c755f2dddb2c76bfe39ca2dd2e6 100644 (file)
--- a/check/common
+++ b/check/common
@@ -11,12 +11,13 @@ export PKG_CONFIG_PATH
 
 run_test () {
     ${pkgconfig} $ARGS >/dev/null 2>&1
-    if [ "$?" -ne "0" ]; then
-        echo "Running ${pkgconfig} $ARGS failed altogether, bailing"
+    R=$?
+    if [ "$R" -ne "${EXPECT_RETURN:-0}" ]; then
+       echo "${pkgconfig} $ARGS exited with $R (expected $EXPECT_RETURN)"
         exit 1
     fi
 
-    R=$(${pkgconfig} $ARGS | sed -e 's,^[[:space:]]*,,' -e 's,[[:space:]]*$,,')
+    R=$(${pkgconfig} $ARGS 2>&1 | sed -e 's,^[[:space:]]*,,' -e 's,[[:space:]]*$,,')
     if [ "$R" != "$RESULT" ]; then
        echo "${pkgconfig} $ARGS :"
        echo "'$R' != '$RESULT'"