Merge branch 'mg/make-prove' into next

* mg/make-prove:
  test: allow running the tests under "prove"

diff --cc t/Makefile
index 7aa409ab645e46a506b9627c9f8aab01da54e6c3,2b4d4ac9042d4382bc97432840a6a810c649c327..73c6ec473da2d13b9e5bf3d6feb7cfca4937e109
--- 1/t/Makefile
--- 2/t/Makefile
+++ b/t/Makefile
@@@ -17,11 -19,16 +19,17 @@@ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_
  
  T = $(wildcard t[0-9][0-9][0-9][0-9]-*.sh)
  TSVN = $(wildcard t91[0-9][0-9]-*.sh)
 +TGITWEB = $(wildcard t95[0-9][0-9]-*.sh)
  
- all: pre-clean
+ all: $(DEFAULT_TEST_TARGET)
+ 
+ test: pre-clean
        $(MAKE) aggregate-results-and-cleanup
  
+ prove: pre-clean
+       @echo "*** prove ***"; GIT_CONFIG=.git/config $(PROVE) --exec '$(SHELL_PATH_SQ)' $(GIT_PROVE_OPTS) $(T) :: $(GIT_TEST_OPTS)
+       $(MAKE) clean
+ 
  $(T):
        @echo "*** $@ ***"; GIT_CONFIG=.git/config '$(SHELL_PATH_SQ)' $@ $(GIT_TEST_OPTS)