From 5235d06159ba6fee412bee261ea7867d061252b0 Mon Sep 17 00:00:00 2001
From: Jakob Buchgraber <buchgr@google.com>
Date: Wed, 12 Apr 2017 14:30:38 +0200
Subject: protobuf: Update protobuf to @laszlocsomor's master at commit
 421d909.

Update protobuf to @laszlocsomor's fork of protobuf. This is essentially
the development version of protobuf 3.2.0 and windows specific fixes
from laszlo. Those fixes will be merged into protobuf soon:
https://github.com/google/protobuf/pull/2969).

For instructions on how to update protobuf for bazel see
README.bazel.md.

Change-Id: Ic1daafe30270cb6bcc6231e6c94fb670af0475e7
---
 third_party/protobuf/python/tox.ini | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 third_party/protobuf/python/tox.ini

(limited to 'third_party/protobuf/python/tox.ini')

diff --git a/third_party/protobuf/python/tox.ini b/third_party/protobuf/python/tox.ini
new file mode 100644
index 0000000000..1600db21fc
--- /dev/null
+++ b/third_party/protobuf/python/tox.ini
@@ -0,0 +1,24 @@
+[tox]
+envlist =
+    py{26,27,33,34}-{cpp,python}
+
+[testenv]
+usedevelop=true
+passenv = CC
+setenv =
+    cpp: LD_LIBRARY_PATH={toxinidir}/../src/.libs
+    cpp: DYLD_LIBRARY_PATH={toxinidir}/../src/.libs
+    cpp: PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=cpp
+commands =
+    python setup.py -q build_py
+    python: python setup.py -q build
+    cpp: python setup.py -q build --cpp_implementation --warnings_as_errors --compile_static_extension
+    python: python setup.py -q test -q
+    cpp: python setup.py -q test -q --cpp_implementation
+    python: python setup.py -q test_conformance
+    cpp: python setup.py -q test_conformance --cpp_implementation
+deps =
+    # Keep this list of dependencies in sync with setup.py.
+    six>=1.9
+    py26: ordereddict
+    py26: unittest2
-- 
cgit v1.2.3