From d0ce99e59ecc8d62eefbf1322736880159a7e9e7 Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Sat, 18 Jul 2015 11:56:41 +0200 Subject: Makefile: do not call `clean` before `test` Fixes #288 Modifications: - call `make clean` explicitely to clean the workspace - add `make clean` to Travis instructions Signed-off-by: VirtualTam --- .travis.yml | 1 + Makefile | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index d10311c9..80db6506 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,4 +9,5 @@ install: - composer self-update - composer install script: + - make clean - make test diff --git a/Makefile b/Makefile index 80efcfaa..28353587 100644 --- a/Makefile +++ b/Makefile @@ -102,7 +102,7 @@ mess_detector_summary: mess_title # See phpunit.xml for configuration # https://phpunit.de/manual/current/en/appendixes.configuration.html ## -test: clean +test: @echo "-------" @echo "PHPUNIT" @echo "-------" @@ -114,13 +114,13 @@ test: clean ### remove all unversioned files clean: - @git clean -df + @git clean -df ### update the local copy of the documentation doc: clean - @rm -rf doc - @git clone https://github.com/shaarli/Shaarli.wiki.git doc - @rm -rf doc/.git + @rm -rf doc + @git clone https://github.com/shaarli/Shaarli.wiki.git doc + @rm -rf doc/.git ### Convert local markdown documentation to HTML htmldoc: -- cgit v1.2.3