Revert "third_party/protobuf: Update to HEAD (83d681ee2c)"

third_party/protobuf/conformance/conformance_test_runner.cc

 // Protocol Buffers - Google's data interchange format
 // Copyright 2008 Google Inc.  All rights reserved.
 // https://developers.google.com/protocol-buffers/
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
@@ skipping 233 matching lines @@
   fprintf(stderr, "\n");
   fprintf(stderr, "Options:\n");
   fprintf(stderr,
           "  --failure_list <filename>   Use to specify list of tests\n");
   fprintf(stderr,
           "                              that are expected to fail.  File\n");
   fprintf(stderr,
           "                              should contain one test name per\n");
   fprintf(stderr,
           "                              line.  Use '#' for comments.\n");
-  fprintf(stderr,
-          "  --enforce_recommended       Enforce that recommended test\n");
-  fprintf(stderr,
-          "                              cases are also passing. Specify\n");
-  fprintf(stderr,
-          "                              this flag if you want to be\n");
-  fprintf(stderr,
-          "                              strictly conforming to protobuf\n");
-  fprintf(stderr,
-          "                              spec.\n");
   exit(1);
 }
 
 void ParseFailureList(const char *filename, vector<string>* failure_list) {
   std::ifstream infile(filename);
 
   if (!infile.is_open()) {
     fprintf(stderr, "Couldn't open failure list file: %s\n", filename);
     exit(1);
   }
 
   for (string line; getline(infile, line);) {
     // Remove whitespace.
     line.erase(std::remove_if(line.begin(), line.end(), ::isspace),
                line.end());
 
     // Remove comments.
     line = line.substr(0, line.find("#"));
 
     if (!line.empty()) {
       failure_list->push_back(line);
     }
   }
 }
 
 int main(int argc, char *argv[]) {
   char *program;
   google::protobuf::ConformanceTestSuite suite;
 
-  string failure_list_filename;
   vector<string> failure_list;
 
   for (int arg = 1; arg < argc; ++arg) {
     if (strcmp(argv[arg], "--failure_list") == 0) {
       if (++arg == argc) UsageError();
-      failure_list_filename = argv[arg];
       ParseFailureList(argv[arg], &failure_list);
     } else if (strcmp(argv[arg], "--verbose") == 0) {
       suite.SetVerbose(true);
-    } else if (strcmp(argv[arg], "--enforce_recommended") == 0) {
-      suite.SetEnforceRecommended(true);
     } else if (argv[arg][0] == '-') {
       fprintf(stderr, "Unknown option: %s\n", argv[arg]);
       UsageError();
     } else {
       if (arg != argc - 1) {
         fprintf(stderr, "Too many arguments.\n");
         UsageError();
       }
       program = argv[arg];
     }
   }
 
-  suite.SetFailureList(failure_list_filename, failure_list);
+  suite.SetFailureList(failure_list);
   ForkPipeRunner runner(program);
 
   std::string output;
   bool ok = suite.RunSuite(&runner, &output);
 
   fwrite(output.c_str(), 1, output.size(), stderr);
 
   return ok ? EXIT_SUCCESS : EXIT_FAILURE;
 }