From 81564101ee5d69e3b3d19ca533c2d3bd55d1c870 Mon Sep 17 00:00:00 2001 From: Thomas Van Lenten Date: Mon, 15 Aug 2016 16:31:39 -0400 Subject: Fix up ignores and conformance generation - Update ruby conformance generation for rename of generated files that seems to have happened. - Update gitignores for the above and for the no-warnings-test. --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 5cb8cba9..8f12f220 100644 --- a/.gitignore +++ b/.gitignore @@ -64,6 +64,8 @@ src/protoc src/unittest_proto_middleman # Generated test scaffolding +src/no_warning_test.cc +src/no-warning-test src/protobuf*-test src/test_plugin src/testzip.* @@ -108,7 +110,7 @@ conformance/conformance.pb.cc conformance/conformance.pb.h conformance/Conformance.pbobjc.h conformance/Conformance.pbobjc.m -conformance/conformance.rb +conformance/conformance_pb.rb conformance/google/ conformance/javac_middleman conformance/lite/ -- cgit v1.2.3