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 <virtualtam@flibidi.net>

diff --git a/.travis.yml b/.travis.yml
index d10311c9f0761edf35a87ab074119538726935a8..80db65060510272f9c51e83c64773b20538a6842 100644 (file)
--- 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 80efcfaafd0e2973c4ea73aaf0c33e3ff77a0ca0..28353587c238dfdd91809d00d7debc751c2178e7 100644 (file)
--- 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: