aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjieluo@google.com <jieluo@google.com@630680e5-0e50-0410-840e-4b1c322b438d>2014-08-14 21:51:48 +0000
committerjieluo@google.com <jieluo@google.com@630680e5-0e50-0410-840e-4b1c322b438d>2014-08-14 21:51:48 +0000
commite61b513b1ffa4300fda1a43cf3fb59918db61009 (patch)
tree17c3df8307a4781d2c0a0e2a79b4550133b112d6
parent24095cc7e545d6f4044820a75fc42cbdd824cdca (diff)
downloadprotobuf-e61b513b1ffa4300fda1a43cf3fb59918db61009.tar.gz
protobuf-e61b513b1ffa4300fda1a43cf3fb59918db61009.tar.bz2
protobuf-e61b513b1ffa4300fda1a43cf3fb59918db61009.zip
make dist complains the file name is too long and refuse to put it to tar. Change the file to a shorter name
-rwxr-xr-xpython/google/protobuf/internal/text_format_test.py2
-rw-r--r--src/Makefile.am4
-rw-r--r--src/google/protobuf/testdata/text_format_unittest_data_pointy_oneof.txt (renamed from src/google/protobuf/testdata/text_format_unittest_data_pointy_oneof_implemented.txt)0
3 files changed, 4 insertions, 2 deletions
diff --git a/python/google/protobuf/internal/text_format_test.py b/python/google/protobuf/internal/text_format_test.py
index a85d4dd8..d27ff7a2 100755
--- a/python/google/protobuf/internal/text_format_test.py
+++ b/python/google/protobuf/internal/text_format_test.py
@@ -90,7 +90,7 @@ class TextFormatTest(basetest.TestCase):
self.CompareToGoldenFile(
self.RemoveRedundantZeros(
text_format.MessageToString(message, pointy_brackets=True)),
- 'text_format_unittest_data_pointy_oneof_implemented.txt')
+ 'text_format_unittest_data_pointy_oneof.txt')
def testPrintAllExtensionsPointy(self):
message = unittest_pb2.TestAllExtensions()
diff --git a/src/Makefile.am b/src/Makefile.am
index 3a164ff1..9592f6f6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -246,9 +246,11 @@ EXTRA_DIST = \
google/protobuf/testdata/golden_message \
google/protobuf/testdata/golden_message_oneof_implemented \
google/protobuf/testdata/golden_packed_fields_message \
+ google/protobuf/testdata/bad_utf8_string \
+ google/protobuf/testdata/text_format_unittest_data.txt \
google/protobuf/testdata/text_format_unittest_data_oneof_implemented.txt \
google/protobuf/testdata/text_format_unittest_data_pointy.txt \
- google/protobuf/testdata/text_format_unittest_data_pointy_oneof_implemented.txt \
+ google/protobuf/testdata/text_format_unittest_data_pointy_oneof.txt \
google/protobuf/testdata/text_format_unittest_extensions_data.txt \
google/protobuf/testdata/text_format_unittest_extensions_data_pointy.txt \
google/protobuf/package_info.h \
diff --git a/src/google/protobuf/testdata/text_format_unittest_data_pointy_oneof_implemented.txt b/src/google/protobuf/testdata/text_format_unittest_data_pointy_oneof.txt
index 95109f62..95109f62 100644
--- a/src/google/protobuf/testdata/text_format_unittest_data_pointy_oneof_implemented.txt
+++ b/src/google/protobuf/testdata/text_format_unittest_data_pointy_oneof.txt