diff options
| author | Daiki Ueno <dueno@redhat.com> | 2017-10-06 14:21:32 +0200 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2017-10-06 16:56:58 +0200 |
| commit | 29b8197e879dc8be8e356f57e6a3a501cdf657f9 (patch) | |
| tree | bb8cdfbc464dc5dbf4e8beae7cf449458c7732f4 | |
| parent | 96a3d3e6371785f846bc72c2a701a1eb67c89b77 (diff) | |
build: Take advantage of parallel-tests
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | configure.ac | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index f6c634d..dae8083 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,4 +38,7 @@ install: script: - docker exec $CONTAINER sh -c "cd /srcdir && NOCONFIGURE=1 ./autogen.sh" - docker exec $CONTAINER su - user sh -c "cd /builddir && ../srcdir/configure --enable-strict $BUILD_OPTS" - - docker exec $CONTAINER su - user sh -c "cd /builddir && $SCAN_BUILD make V=1 && make check V=1 TESTS_ENVIRONMENT=\"$TESTS_ENVIRONMENT\"" + - docker exec $CONTAINER su - user sh -c "cd /builddir && $SCAN_BUILD make -j$(nproc) V=1 && make check -j$(nproc) V=1 TESTS_ENVIRONMENT=\"$TESTS_ENVIRONMENT\"" + +after_failure: + - docker exec $CONTAINER su - user sh -c "cd /builddir && cat test-suite.log" diff --git a/Makefile.am b/Makefile.am index 1dc202d..bcbd049 100644 --- a/Makefile.am +++ b/Makefile.am @@ -57,6 +57,7 @@ DISTCHECK_CONFIGURE_FLAGS = \ AM_TESTS_ENVIRONMENT = \ abs_top_builddir="$(abs_top_builddir)"; \ export abs_top_builddir; +AM_TESTS_FD_REDIRECT = 9>&2; MEMCHECK_ENV = $(TEST_RUNNER) valgrind --error-exitcode=80 --quiet diff --git a/configure.ac b/configure.ac index 5ff847e..6f49ed4 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ P11KIT_AGE=3 AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([build/m4]) AC_CONFIG_AUX_DIR([build/litter]) -AM_INIT_AUTOMAKE([1.12 foreign serial-tests subdir-objects]) +AM_INIT_AUTOMAKE([1.12 foreign subdir-objects]) AM_SANITY_CHECK AM_MAINTAINER_MODE([enable]) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])],) |