Merge branch 'lrb/travis-ci-build'

.travis.yml

@@ -0,0 +1,17 @@
+language: erlang
+addons:
+  apt:
+    packages:
+      - libprotobuf-dev
+      - protobuf-compiler
+otp_release:
+  - 19.1
+  - 18.3
+  - 17.5
+  - R16B03
+  - R15B03
+env:
+  - VERBOSE=1
+script:
+  - make
+  - make test

README.md

@@ -4,6 +4,11 @@ for Erlang.
 See https://developers.google.com/protocol-buffers/ for further information
 on the Google protocol buffers.
 
+Build Status
+------------
+
+[![Build Status](https://travis-ci.org/tomas-abrahamsson/gpb.svg?branch=master)](https://travis-ci.org/tomas-abrahamsson/gpb)
+
 Basic example of using gpb
 --------------------------
 

test/gpb_compile_tests.erl

@@ -894,7 +894,10 @@ generates_escaped_utf8_for_old_erlang_versions_test() ->
 
 -define(x_com_atom_1(C), 10,10,"x.com/atom",18,1,C).
 
-'translation_of_google.protobuf.Any_test'() ->
+'translation_of_google.protobuf.Any_test_'() ->
+    {timeout,10,fun 'translation_of_google.protobuf.Any_aux'/0}.
+
+'translation_of_google.protobuf.Any_aux'() ->
     %% The any.proto contains:
     %%
     %%     syntax = "proto3";