From 23d1504de4111223dc4805c6f4176a4d9e028b79 Mon Sep 17 00:00:00 2001 From: Jason Gross Date: Tue, 15 Aug 2017 12:00:18 -0400 Subject: Better error messages on the CI This makes it so that when a ci target fails, we don't get red herring error messages about .ok files not existing. Since this requires bash, we make a helper script that invokes bash, so as to not depend on bash in general. --- Makefile.ci | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'Makefile.ci') diff --git a/Makefile.ci b/Makefile.ci index 1b09905cc..a5b3b1491 100644 --- a/Makefile.ci +++ b/Makefile.ci @@ -24,9 +24,7 @@ CI_TARGETS=ci-all \ # Generic rule, we use make to easy travis integraton with mixed rules $(CI_TARGETS): ci-%: - rm -f ci-$*.ok - +(./dev/ci/ci-$*.sh 2>&1 && touch ci-$*.ok) | tee time-of-build.log + +./dev/ci/ci-pipe-tee.sh ./dev/ci/ci-$*.sh time-of-build.log echo 'Aggregating timing log...' && echo -en 'travis_fold:start:coq.test.timing\\r' python ./tools/make-one-time-file.py time-of-build.log echo -en 'travis_fold:end:coq.test.timing\\r' - rm ci-$*.ok # must not be -f; we're checking to see that it exists -- cgit v1.2.3