aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Tamir Duberstein <tamird@gmail.com>2015-03-31 10:19:05 -0700
committerGravatar Tamir Duberstein <tamird@gmail.com>2015-03-31 10:21:49 -0700
commit53bee665f8406c966443f67bd8ee4f433cec9497 (patch)
treef4b882b37f800421bbdd025ada19d7caab70537d
parent86d93063c6d662e7cae91ff8a2adf39b4d93fe53 (diff)
Change fixture name to be consistent
This fixes the problem where `make check` generates files not ignored by `.gitignore`.
-rw-r--r--src/Makefile.am6
-rw-r--r--src/google/protobuf/compiler/cpp/cpp_test_large_enum_value.proto (renamed from src/google/protobuf/compiler/cpp/test_large_enum_value.proto)0
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 8a27b823..7811b0ae 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -322,7 +322,7 @@ protoc_inputs = \
google/protobuf/unittest_preserve_unknown_enum2.proto \
google/protobuf/unittest_proto3_arena.proto \
google/protobuf/compiler/cpp/cpp_test_bad_identifiers.proto \
- google/protobuf/compiler/cpp/test_large_enum_value.proto
+ google/protobuf/compiler/cpp/cpp_test_large_enum_value.proto
EXTRA_DIST = \
$(protoc_inputs) \
@@ -398,8 +398,8 @@ protoc_outputs = \
google/protobuf/unittest_preserve_unknown_enum2.pb.h \
google/protobuf/unittest_proto3_arena.pb.cc \
google/protobuf/unittest_proto3_arena.pb.h \
- google/protobuf/compiler/cpp/test_large_enum_value.pb.cc \
- google/protobuf/compiler/cpp/test_large_enum_value.pb.h \
+ google/protobuf/compiler/cpp/cpp_test_large_enum_value.pb.cc \
+ google/protobuf/compiler/cpp/cpp_test_large_enum_value.pb.h \
google/protobuf/compiler/cpp/cpp_test_bad_identifiers.pb.cc \
google/protobuf/compiler/cpp/cpp_test_bad_identifiers.pb.h
diff --git a/src/google/protobuf/compiler/cpp/test_large_enum_value.proto b/src/google/protobuf/compiler/cpp/cpp_test_large_enum_value.proto
index cb6ca1b1..cb6ca1b1 100644
--- a/src/google/protobuf/compiler/cpp/test_large_enum_value.proto
+++ b/src/google/protobuf/compiler/cpp/cpp_test_large_enum_value.proto