commit 80f65d2df82cc23eb92ef5355d638b9102074190
author Thomas Van Lenten <thomasvl@google.com> Tue Aug 23 08:19:45 2016 -0400
committer GitHub <noreply@github.com> Tue Aug 23 08:19:45 2016 -0400
tree 7573a77e4b7b55aa39495dd8892d8f52eec1416a
parent b5794ed02420770bf58398581c1ca11e1c9a29d9

Add note about JSON tests maybe being wrong. (#1992)

Add note about JSON tests maybe being wrong.

- Add note about the JSON test maybe not being correct yet.
- Add test to checks the generated names for double underscores to be sure they
  are what is expected.

.gitignore

diff --git a/.gitignore b/.gitignore
index 8f12f22..052dd14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -111,7 +111,10 @@
 conformance/Conformance.pbobjc.h
 conformance/Conformance.pbobjc.m
 conformance/conformance_pb.rb
+conformance/failing_tests.txt
 conformance/google/
 conformance/javac_middleman
 conformance/lite/
+conformance/nonexistent_tests.txt
 conformance/protoc_middleman
+conformance/succeeding_tests.txt