From 3a33730a86fb37c672f90418697eeb259318682d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 11 May 2013 22:37:33 +0200 Subject: [PATCH] build: Run `tests/guix-gc.sh' last to avoid test failures. * Makefile.am (tests/guix-gc.log): New target. This should fix failures that occurred with "make check -j" the first time. --- Makefile.am | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Makefile.am b/Makefile.am index 5370b104af..b55a780fe5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -340,6 +340,14 @@ AM_SCM_LOG_FLAGS = --no-auto-compile -L "$(top_srcdir)" SH_LOG_COMPILER = $(top_builddir)/test-env $(SHELL) AM_SH_LOG_FLAGS = -x -e +# Make sure `tests/guix-gc.sh' runs last, after all the others. Otherwise it +# could end up removing files from the store while they are being used by +# other instances of the daemon. +tests/guix-gc.log: \ + $(patsubst %.sh,%.log,$(filter-out tests/guix-gc.sh,$(SH_TESTS))) \ + $(SCM_TESTS:%.scm=%.log) + + EXTRA_DIST = \ HACKING \ ROADMAP \