Merge branch 'rs/use-strbuf-addstr' into maint

diff --git a/.travis.yml b/.travis.yml
index adab5b89bba7b41a07a2a000dddbd4496ba7c7d3..477c3d2efb7b94bb34fcda517b1b855e98e1f43a 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,6 +18,8 @@ addons:
   apt:
     packages:
     - language-pack-is
+    - git-svn
+    - apache2
 
 env:
   global:
@@ -30,6 +32,7 @@ env:
     - DEFAULT_TEST_TARGET=prove
     - GIT_PROVE_OPTS="--timer --jobs 3 --state=failed,slow,save"
     - GIT_TEST_OPTS="--verbose --tee"
+    - GIT_TEST_HTTPD=true
     - GIT_TEST_CLONE_2GB=YesPlease
     # t9810 occasionally fails on Travis CI OS X
     # t9816 occasionally fails with "TAP out of sequence errors" on Travis CI OS X
@@ -81,6 +84,8 @@ before_install:
       brew tap homebrew/binary --quiet
       brew_force_set_latest_binary_hash perforce
       brew_force_set_latest_binary_hash perforce-server
+      # Uncomment this if you want to run perf tests:
+      # brew install gnu-time
       brew install git-lfs perforce-server perforce gettext
       brew link --force gettext
       ;;