Sync from Piper @427369078
PROTOBUF_SYNC_PIPER
diff --git a/conformance/conformance_test.h b/conformance/conformance_test.h
index 76bd1bc..2861598 100644
--- a/conformance/conformance_test.h
+++ b/conformance/conformance_test.h
@@ -174,6 +174,11 @@
failure_list_flag_name_ = failure_list_flag_name;
}
+ // Sets the path of the output directory.
+ void SetOutputDir(const char* output_dir) {
+ output_dir_ = output_dir;
+ }
+
// Run all the conformance tests against the given test runner.
// Test output will be stored in "output".
//
@@ -296,6 +301,7 @@
bool verbose_;
bool enforce_recommended_;
std::string output_;
+ std::string output_dir_;
std::string failure_list_flag_name_;
std::string failure_list_filename_;
