ctest: show test output in case of failures

ctest as run by cmake by default does not show the output of the tests
even if the tests failed. In terms of our tests it could be handy to set
it always, but unfortunately it seems like cmake doesn't allow it if the
internet is to be believed, so lets enable it at least while building
packages and on travis.

Gbp-Dch: Ignore

diff --git a/.travis.yml b/.travis.yml
index 3c4b5931908c55c460901a89ba21a223d29bf146..424172e04c833035a48eb181a2ac1ec302cf1ae0 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ before_script:
  - ( mkdir build && cd build && cmake .. )
  - make -C build -j4
 script:
- - make -C build test
+ - CTEST_OUTPUT_ON_FAILURE=1 make -C build test
  - ./test/integration/run-tests -q
  - sudo adduser --force-badname --system --home /nonexistent --no-create-home --quiet _apt || true
  - sudo ./test/integration/run-tests -q

diff --git a/README.md b/README.md
index 1c10197130515421de5f2bd1e3fdcba25e49570f..b0470d8bed0e94c3f057e6c880cf639e306e421f 100644 (file)
--- a/README.md
+++ b/README.md
@@ -115,8 +115,10 @@ itself as well as in conjunction with dpkg and other tools while working with pa
 
 ### Unit tests
 
-These tests are gtest-dev based, reside in `./test/libapt` and can be run with `make test`.
-They are executed at package build-time, but not by `make`.
+These tests are gtest-dev based, executed by ctest, reside in `./test/libapt`
+and can be run with `make test`. They are executed at package build-time, but
+not by `make`. CTest by default does not show the output of tests, even if they
+failed, so to see more details you can also run them with `ctest --verbose`.
 
 Debugging
 ---------

diff --git a/debian/rules b/debian/rules
index c1dba72afd66fa97ec789ba62f18f1697493c762..b6dfc96ea0a53950af558bd902fe2b6a89055d83 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,8 @@ export DEB_BUILD_MAINT_OPTIONS := hardening=+all
 # do not fail as we are just experimenting with symbol files for now
 export DPKG_GENSYMBOLS_CHECK_LEVEL=0
 
+export CTEST_OUTPUT_ON_FAILURE=1
+
 %:
        dh $@ --with systemd --parallel --buildsystem=cmake