aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorThomas Van Lenten <thomasvl@google.com>2016-08-15 16:31:39 -0400
committerThomas Van Lenten <thomasvl@google.com>2016-08-15 16:33:22 -0400
commit81564101ee5d69e3b3d19ca533c2d3bd55d1c870 (patch)
tree09c0a0f4c17206ee07e92782234fd8e394386b8d /.gitignore
parent336ee28b34816e279fc0bc26d2b5d1e5ea233976 (diff)
downloadprotobuf-81564101ee5d69e3b3d19ca533c2d3bd55d1c870.tar.gz
protobuf-81564101ee5d69e3b3d19ca533c2d3bd55d1c870.tar.bz2
protobuf-81564101ee5d69e3b3d19ca533c2d3bd55d1c870.zip
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.
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore4
1 files changed, 3 insertions, 1 deletions
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/