summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2016-08-12 10:45:45 +0200
committerDavid Kalnischkies <david@kalnischkies.de>2016-08-12 11:12:00 +0200
commitecaae01f31878a70771f75046b3e00173ff397b5 (patch)
tree3dbd8f8f62ca9f0e1669ebdbb5f29b98e0c4d3ea
parent281383ce1b020013737b28d87988bdf477a90477 (diff)
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
-rw-r--r--.travis.yml2
-rw-r--r--README.md6
-rwxr-xr-xdebian/rules2
3 files changed, 7 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 3c4b59319..424172e04 100644
--- 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 1c1019713..b0470d8be 100644
--- 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 c1dba72af..b6dfc96ea 100755
--- 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