Merge pull request #460 from sandstorm-io/travis-ci

Configure Travis CI for Linux and OSX builds.

.travis.yml

+language: cpp
+os:
+  - linux
+  - osx
+dist: trusty
+sudo: false
+addons:
+  apt:
+    packages:
+      - automake
+      - autoconf
+      - libtool
+      - pkg-config
+before_install:
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install automake autoconf libtool; fi
+script: ./super-test.sh -j2 quick  # limit parallelism due to limited memory on Travis

appveyor.yml

@@ -13,6 +13,11 @@
 
 version: "{build}"
 
+branches:
+  only:
+    - master
+# Don't build non-master branches (unless they open a pull request).
+
 image: Visual Studio 2017
 # AppVeyor build worker image (VM template).
 

c++/src/kj/compat/http.c++

@@ -694,7 +694,7 @@ kj::String HttpHeaders::serialize(kj::ArrayPtr<const char> word1,
 }
 
 kj::String HttpHeaders::toString() const {
-  return serialize(nullptr, nullptr, nullptr, {});
+  return serialize(nullptr, nullptr, nullptr, ConnectionHeaders());
 }
 
 // =======================================================================================
@@ -1528,7 +1528,7 @@ public:
         };
       } else {
         KJ_FAIL_REQUIRE("received invalid HTTP response") { break; }
-        return {};
+        return HttpClient::Response();
       }
     });
 

super-test.sh

@@ -13,6 +13,9 @@ PARALLEL=$(nproc 2>/dev/null || echo 1)
 
 while [ $# -gt 0 ]; do
   case "$1" in
+    -j* )
+      PARALLEL=${1#-j}
+      ;;
     test )
       ;;  # nothing
     quick )