* test/libapt/assert.h, test/libapt/run-tests:

  - exit with status 1 on test failure

diff --git a/debian/changelog b/debian/changelog
index bfc4279b31d1acf405cf581f6fd787ab207477be..ef622c9940eda1a2a50ed2c57e6aba213cc49304 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+apt (0.9.7.8~exp3) UNRELEASEDexperimental; urgency=low
+
+  [ Niels Thykier ]
+  * test/libapt/assert.h, test/libapt/run-tests:
+    - exit with status 1 on test failure
+
+ -- Michael Vogt <mvo@debian.org>  Sun, 17 Mar 2013 19:46:23 +0100
+
 apt (0.9.7.8~exp2) experimental; urgency=low
 
   * include two missing patches to really fix bug #696225, thanks to

diff --git a/test/libapt/assert.h b/test/libapt/assert.h
index fdf6740c6b43f055c87486440cbd8b0c254f6e6c..113c057ede9a73f902ed4342f46244ce907638ef 100644 (file)
--- a/test/libapt/assert.h
+++ b/test/libapt/assert.h
@@ -1,4 +1,5 @@
 #include <iostream>
+#include <cstdlib>
 
 #define equals(x,y) assertEquals(y, x, __LINE__)
 #define equalsNot(x,y) assertEqualsNot(y, x, __LINE__)
@@ -6,6 +7,7 @@
 template < typename X, typename Y >
 void OutputAssertEqual(X expect, char const* compare, Y get, unsigned long const &line) {
        std::cerr << "Test FAILED: »" << expect << "« " << compare << " »" << get << "« at line " << line << std::endl;
+       std::exit(EXIT_FAILURE);
 }
 
 template < typename X, typename Y >

diff --git a/test/libapt/run-tests b/test/libapt/run-tests
index 45a3157f7a98f63fbe9b2cd6d5ccd3b65a29c92c..f18be6d2b1688e48f59a4aba8769a38d4e48e938 100755 (executable)
--- a/test/libapt/run-tests
+++ b/test/libapt/run-tests
@@ -7,6 +7,7 @@ echo "Compiling the tests …"
 echo "Running all testcases …"
 LDPATH="$DIR/../../build/bin"
 EXT="_libapt_test"
+EXIT_CODE=0
 
 # detect if output is on a terminal (colorful) or better not
 if expr match "$(readlink -f /proc/$$/fd/1)" '/dev/pts/[0-9]\+' > /dev/null; then
@@ -106,9 +107,15 @@ do
        fi
 
        echo -n "Testing with ${NAME} "
-       LD_LIBRARY_PATH=${LDPATH} ${testapp} ${tmppath} && echo "$TESTOKAY" || echo "$TESTFAIL"
+       if LD_LIBRARY_PATH=${LDPATH} ${testapp} ${tmppath} ; then
+               echo "$TESTOKAY"
+       else
+               echo "$TESTFAIL"
+               EXIT_CODE=1
+       fi
 
        if [ -n "$tmppath" -a -d "$tmppath" ]; then
                rm -rf "$tmppath"
        fi
 done
+exit $EXIT_CODE