From de3c56a0d1442e5cd4e90716a8697e6bdd123134 Mon Sep 17 00:00:00 2001 From: Thomas Van Lenten Date: Tue, 5 Jan 2016 15:00:51 -0500 Subject: Fix conformance test to only report skips in verbose mode. commit e841bac4fcf47f809e089a70d5f84ac37b3883df seems to have mis-merged the change to reporting skipped tests. I didn't check if there were other merge issues. --- conformance/conformance_test.cc | 3 --- 1 file changed, 3 deletions(-) diff --git a/conformance/conformance_test.cc b/conformance/conformance_test.cc index 135e82dc..c39bf26d 100644 --- a/conformance/conformance_test.cc +++ b/conformance/conformance_test.cc @@ -1967,9 +1967,6 @@ bool ConformanceTestSuite::RunSuite(ConformanceTestRunner* runner, "These tests succeeded, even though they were listed in " "the failure list. Remove them from the failure list"); - CheckSetEmpty(skipped_, - "These tests were skipped (probably because support for some " - "features is not implemented)"); if (verbose_) { CheckSetEmpty(skipped_, "These tests were skipped (probably because support for some " -- cgit v1.2.3