aboutsummaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorYilun Chong <chongyilun250@sina.com>2017-07-24 14:50:52 -0700
committerGitHub <noreply@github.com>2017-07-24 14:50:52 -0700
commita713b73076f1d90bdc39ea8805b50421a59d7986 (patch)
treecea38fdfe5c1d93b6291e96332961b2c3bf5439f /python
parentf15185d370a5789c65105f77ba806c9faa563325 (diff)
parentbceb830c396e3370d4cc15e0d4f96ed1819dcca9 (diff)
downloadprotobuf-a713b73076f1d90bdc39ea8805b50421a59d7986.tar.gz
protobuf-a713b73076f1d90bdc39ea8805b50421a59d7986.tar.bz2
protobuf-a713b73076f1d90bdc39ea8805b50421a59d7986.zip
Merge pull request #3281 from BSBandme/ConformanceTestYilunChong
Proto2 test message support to conformance test
Diffstat (limited to 'python')
-rwxr-xr-xpython/setup.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/python/setup.py b/python/setup.py
index a2026706..70b7de5c 100755
--- a/python/setup.py
+++ b/python/setup.py
@@ -80,6 +80,7 @@ def GenerateUnittestProtos():
generate_proto("../src/google/protobuf/any_test.proto", False)
generate_proto("../src/google/protobuf/map_unittest.proto", False)
generate_proto("../src/google/protobuf/test_messages_proto3.proto", False)
+ generate_proto("../src/google/protobuf/test_messages_proto2.proto", False)
generate_proto("../src/google/protobuf/unittest_arena.proto", False)
generate_proto("../src/google/protobuf/unittest_no_arena.proto", False)
generate_proto("../src/google/protobuf/unittest_no_arena_import.proto", False)