Explorar el Código

Use Subprocess::Win32ErrorMessage() in command_line_interface_unittest to make the it OS locale independent.

liujisi@google.com hace 15 años
padre
commit
57014ffa52

+ 3 - 3
src/google/protobuf/compiler/command_line_interface_unittest.cc

@@ -48,6 +48,7 @@
 #include <google/protobuf/compiler/command_line_interface.h>
 #include <google/protobuf/compiler/command_line_interface.h>
 #include <google/protobuf/compiler/code_generator.h>
 #include <google/protobuf/compiler/code_generator.h>
 #include <google/protobuf/compiler/mock_code_generator.h>
 #include <google/protobuf/compiler/mock_code_generator.h>
+#include <google/protobuf/compiler/subprocess.h>
 #include <google/protobuf/io/printer.h>
 #include <google/protobuf/io/printer.h>
 #include <google/protobuf/unittest.pb.h>
 #include <google/protobuf/unittest.pb.h>
 #include <google/protobuf/testing/file.h>
 #include <google/protobuf/testing/file.h>
@@ -1140,9 +1141,8 @@ TEST_F(CommandLineInterfaceTest, GeneratorPluginNotFound) {
       "--proto_path=$tmpdir error.proto");
       "--proto_path=$tmpdir error.proto");
 
 
 #ifdef _WIN32
 #ifdef _WIN32
-  ExpectErrorSubstring(
-      "--badplug_out: prefix-gen-badplug: The system cannot find the file "
-        "specified.");
+  ExpectErrorSubstring("--badplug_out: prefix-gen-badplug: " +
+      Subprocess::Win32ErrorMessage(ERROR_FILE_NOT_FOUND));
 #else
 #else
   // Error written to stdout by child process after exec() fails.
   // Error written to stdout by child process after exec() fails.
   ExpectErrorSubstring(
   ExpectErrorSubstring(