diff options
author | kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2009-12-18 02:11:36 +0000 |
---|---|---|
committer | kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2009-12-18 02:11:36 +0000 |
commit | fccb146e3fe437b0df1e9c50d4b8e1080ddb4bd9 (patch) | |
tree | 9f2d9fe0267d96a54e541377ffeada3d0bff0d1d /python/setup.py | |
parent | d5cf7b55a6a1f959d1646785f63ca2b62da78079 (diff) | |
download | protobuf-fccb146e3fe437b0df1e9c50d4b8e1080ddb4bd9.tar.gz protobuf-fccb146e3fe437b0df1e9c50d4b8e1080ddb4bd9.tar.bz2 protobuf-fccb146e3fe437b0df1e9c50d4b8e1080ddb4bd9.zip |
Massive roll-up of changes. See CHANGES.txt.
Diffstat (limited to 'python/setup.py')
-rwxr-xr-x | python/setup.py | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/python/setup.py b/python/setup.py index 118ccd41..4051c533 100755 --- a/python/setup.py +++ b/python/setup.py @@ -58,16 +58,13 @@ def MakeTestSuite(): generate_proto("../src/google/protobuf/unittest.proto") generate_proto("../src/google/protobuf/unittest_import.proto") generate_proto("../src/google/protobuf/unittest_mset.proto") + generate_proto("../src/google/protobuf/unittest_no_generic_services.proto") generate_proto("google/protobuf/internal/more_extensions.proto") generate_proto("google/protobuf/internal/more_messages.proto") import unittest import google.protobuf.internal.generator_test as generator_test - import google.protobuf.internal.decoder_test as decoder_test import google.protobuf.internal.descriptor_test as descriptor_test - import google.protobuf.internal.encoder_test as encoder_test - import google.protobuf.internal.input_stream_test as input_stream_test - import google.protobuf.internal.output_stream_test as output_stream_test import google.protobuf.internal.reflection_test as reflection_test import google.protobuf.internal.service_reflection_test \ as service_reflection_test @@ -77,11 +74,7 @@ def MakeTestSuite(): loader = unittest.defaultTestLoader suite = unittest.TestSuite() for test in [ generator_test, - decoder_test, descriptor_test, - encoder_test, - input_stream_test, - output_stream_test, reflection_test, service_reflection_test, text_format_test, @@ -114,9 +107,7 @@ if __name__ == '__main__': 'google.protobuf.internal.containers', 'google.protobuf.internal.decoder', 'google.protobuf.internal.encoder', - 'google.protobuf.internal.input_stream', 'google.protobuf.internal.message_listener', - 'google.protobuf.internal.output_stream', 'google.protobuf.internal.type_checkers', 'google.protobuf.internal.wire_format', 'google.protobuf.descriptor', |