aboutsummaryrefslogtreecommitdiff
path: root/conformance/conformance_test.h
diff options
context:
space:
mode:
authorJon Skeet <skeet@pobox.com>2015-07-21 12:58:43 +0100
committerJon Skeet <skeet@pobox.com>2015-07-21 12:58:43 +0100
commit2ee4b5665520fe3245eb5e15df8bd35e0c539a07 (patch)
treef5e81c7ea4d414c6a388ebc86ab62175240660d1 /conformance/conformance_test.h
parentc792db5d0878871d8f2f78cf12c7e597060088c8 (diff)
parent353b7a99857442c7c64a56111b3910b63237ccc8 (diff)
downloadprotobuf-2ee4b5665520fe3245eb5e15df8bd35e0c539a07.tar.gz
protobuf-2ee4b5665520fe3245eb5e15df8bd35e0c539a07.tar.bz2
protobuf-2ee4b5665520fe3245eb5e15df8bd35e0c539a07.zip
Merge pull request #629 from google/master
Integrate changes from upstream/master into csharp-experimental
Diffstat (limited to 'conformance/conformance_test.h')
-rw-r--r--conformance/conformance_test.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/conformance/conformance_test.h b/conformance/conformance_test.h
index cadda828..9e6cdaee 100644
--- a/conformance/conformance_test.h
+++ b/conformance/conformance_test.h
@@ -85,6 +85,8 @@ class ConformanceTestSuite {
public:
ConformanceTestSuite() : verbose_(false) {}
+ void SetVerbose(bool verbose) { verbose_ = verbose; }
+
// Sets the list of tests that are expected to fail when RunSuite() is called.
// RunSuite() will fail unless the set of failing tests is exactly the same
// as this list.