aboutsummaryrefslogtreecommitdiff
path: root/conformance/ConformanceJava.java
diff options
context:
space:
mode:
authorJoshua Haberman <jhaberman@gmail.com>2016-04-11 23:37:42 -0700
committerJoshua Haberman <jhaberman@gmail.com>2016-04-11 23:37:42 -0700
commit814685ca2cd9280ca401e1842fd6311440921a0a (patch)
tree5c2cac2b5ba07fe345fdda74c270b32c8f7b9331 /conformance/ConformanceJava.java
parent3ffbdd712f0413ce4964d626c5e10533f1f74893 (diff)
parent3c4ce528c63f4dc39d15de963020472980ee7229 (diff)
downloadprotobuf-814685ca2cd9280ca401e1842fd6311440921a0a.tar.gz
protobuf-814685ca2cd9280ca401e1842fd6311440921a0a.tar.bz2
protobuf-814685ca2cd9280ca401e1842fd6311440921a0a.zip
Merge pull request #1397 from google/internal-merge
Internal merge
Diffstat (limited to 'conformance/ConformanceJava.java')
-rw-r--r--conformance/ConformanceJava.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/conformance/ConformanceJava.java b/conformance/ConformanceJava.java
index a983ba3c..43787ffc 100644
--- a/conformance/ConformanceJava.java
+++ b/conformance/ConformanceJava.java
@@ -129,7 +129,7 @@ class ConformanceJava {
typeRegistry = TypeRegistry.newBuilder().add(
Conformance.TestAllTypes.getDescriptor()).build();
while (doTestIo()) {
- // Empty.
+ this.testCount++;
}
System.err.println("ConformanceJava: received EOF from test runner after " +