diff options
author | Thomas Van Lenten <thomasvl@google.com> | 2016-01-05 15:00:51 -0500 |
---|---|---|
committer | Thomas Van Lenten <thomasvl@google.com> | 2016-01-05 15:00:51 -0500 |
commit | de3c56a0d1442e5cd4e90716a8697e6bdd123134 (patch) | |
tree | 4b7e3b2dfee9531d110fba9a14af9550bafd34f3 | |
parent | d7183b0abd57ab9492f328768668335469c4695f (diff) | |
download | protobuf-de3c56a0d1442e5cd4e90716a8697e6bdd123134.tar.gz protobuf-de3c56a0d1442e5cd4e90716a8697e6bdd123134.tar.bz2 protobuf-de3c56a0d1442e5cd4e90716a8697e6bdd123134.zip |
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.
-rw-r--r-- | conformance/conformance_test.cc | 3 |
1 files changed, 0 insertions, 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 " |