From 53bee665f8406c966443f67bd8ee4f433cec9497 Mon Sep 17 00:00:00 2001 From: Tamir Duberstein Date: Tue, 31 Mar 2015 10:19:05 -0700 Subject: [PATCH 1/2] Change fixture name to be consistent This fixes the problem where `make check` generates files not ignored by `.gitignore`. --- src/Makefile.am | 6 +++--- ...rge_enum_value.proto => cpp_test_large_enum_value.proto} | 0 2 files changed, 3 insertions(+), 3 deletions(-) rename src/google/protobuf/compiler/cpp/{test_large_enum_value.proto => cpp_test_large_enum_value.proto} (100%) 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 similarity index 100% rename from src/google/protobuf/compiler/cpp/test_large_enum_value.proto rename to src/google/protobuf/compiler/cpp/cpp_test_large_enum_value.proto From b63d432add765a9938dbd76f93cbfb9e1150ec47 Mon Sep 17 00:00:00 2001 From: Tamir Duberstein Date: Tue, 31 Mar 2015 10:21:41 -0700 Subject: [PATCH 2/2] `.gitignore` generated file --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index cb0347fc..b8ba4892 100644 --- a/.gitignore +++ b/.gitignore @@ -27,6 +27,7 @@ src/Makefile /config.h config.log config.status +pbconfig.h libtool protobuf-lite.pc