From 5db217305f37a79eeccd70f000088a06ec82fcec Mon Sep 17 00:00:00 2001
From: Bo Yang <teboring@google.com>
Date: Thu, 21 May 2015 14:28:59 -0700
Subject: down-integrate internal changes

---
 conformance/conformance_test.cc | 1 +
 1 file changed, 1 insertion(+)

(limited to 'conformance/conformance_test.cc')

diff --git a/conformance/conformance_test.cc b/conformance/conformance_test.cc
index 61029e44..857f2152 100644
--- a/conformance/conformance_test.cc
+++ b/conformance/conformance_test.cc
@@ -295,6 +295,7 @@ void ConformanceTestSuite::RunSuite(ConformanceTestRunner* runner,
   failures_ = 0;
 
   for (int i = 1; i <= FieldDescriptor::MAX_TYPE; i++) {
+    if (i == FieldDescriptor::TYPE_GROUP) continue;
     TestPrematureEOFForType(static_cast<WireFormatLite::FieldType>(i));
   }
 
-- 
cgit v1.2.3