Index: third_party/protobuf/src/google/protobuf/compiler/command_line_interface_unittest.cc |
diff --git a/third_party/protobuf/src/google/protobuf/compiler/command_line_interface_unittest.cc b/third_party/protobuf/src/google/protobuf/compiler/command_line_interface_unittest.cc |
index dda007d48f728f2eeb92d7d4a946a16279e93956..9b504d25247686de14c1feebb16b77989a9fbea0 100644 |
--- a/third_party/protobuf/src/google/protobuf/compiler/command_line_interface_unittest.cc |
+++ b/third_party/protobuf/src/google/protobuf/compiler/command_line_interface_unittest.cc |
@@ -60,9 +60,11 @@ |
#include <google/protobuf/stubs/strutil.h> |
#include <google/protobuf/stubs/substitute.h> |
+#include <google/protobuf/testing/file.h> |
#include <google/protobuf/testing/googletest.h> |
#include <gtest/gtest.h> |
+ |
namespace google { |
namespace protobuf { |
namespace compiler { |
@@ -376,7 +378,9 @@ void CommandLineInterfaceTest::CreateTempFile( |
// Write file. |
string full_name = temp_directory_ + "/" + name; |
- GOOGLE_CHECK_OK(File::SetContents(full_name, contents, true)); |
+ GOOGLE_CHECK_OK(File::SetContents( |
+ full_name, StringReplace(contents, "$tmpdir", temp_directory_, true), |
+ true)); |
} |
void CommandLineInterfaceTest::CreateTempDir(const string& name) { |
@@ -1090,6 +1094,7 @@ TEST_F(CommandLineInterfaceTest, WriteDependencyManifestFileForAbsolutePath) { |
} |
#endif // !_WIN32 |
+ |
// ------------------------------------------------------------------- |
TEST_F(CommandLineInterfaceTest, ParseErrors) { |