r314051 - Commit missing fixes for tool_file_rename

Reid Kleckner via cfe-commits cfe-commits at lists.llvm.org
Fri Sep 22 18:04:42 PDT 2017


Author: rnk
Date: Fri Sep 22 18:04:42 2017
New Revision: 314051

URL: http://llvm.org/viewvc/llvm-project?rev=314051&view=rev
Log:
Commit missing fixes for tool_file_rename

Modified:
    cfe/trunk/unittests/CrossTU/CrossTranslationUnitTest.cpp
    cfe/trunk/unittests/Frontend/ASTUnitTest.cpp
    cfe/trunk/unittests/Frontend/CompilerInstanceTest.cpp

Modified: cfe/trunk/unittests/CrossTU/CrossTranslationUnitTest.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/CrossTU/CrossTranslationUnitTest.cpp?rev=314051&r1=314050&r2=314051&view=diff
==============================================================================
--- cfe/trunk/unittests/CrossTU/CrossTranslationUnitTest.cpp (original)
+++ cfe/trunk/unittests/CrossTU/CrossTranslationUnitTest.cpp Fri Sep 22 18:04:42 2017
@@ -44,13 +44,13 @@ public:
     llvm::SmallString<256> ASTFileName;
     ASSERT_FALSE(
         llvm::sys::fs::createTemporaryFile("f_ast", "ast", ASTFD, ASTFileName));
-    llvm::tool_output_file ASTFile(ASTFileName, ASTFD);
+    llvm::ToolOutputFile ASTFile(ASTFileName, ASTFD);
 
     int IndexFD;
     llvm::SmallString<256> IndexFileName;
     ASSERT_FALSE(llvm::sys::fs::createTemporaryFile("index", "txt", IndexFD,
                                                     IndexFileName));
-    llvm::tool_output_file IndexFile(IndexFileName, IndexFD);
+    llvm::ToolOutputFile IndexFile(IndexFileName, IndexFD);
     IndexFile.os() << "c:@F at f#I# " << ASTFileName << "\n";
     IndexFile.os().flush();
     EXPECT_TRUE(llvm::sys::fs::exists(IndexFileName));
@@ -61,7 +61,7 @@ public:
     llvm::SmallString<256> SourceFileName;
     ASSERT_FALSE(llvm::sys::fs::createTemporaryFile("input", "cpp", SourceFD,
                                                     SourceFileName));
-    llvm::tool_output_file SourceFile(SourceFileName, SourceFD);
+    llvm::ToolOutputFile SourceFile(SourceFileName, SourceFD);
     SourceFile.os() << SourceText;
     SourceFile.os().flush();
     EXPECT_TRUE(llvm::sys::fs::exists(SourceFileName));
@@ -118,7 +118,7 @@ TEST(CrossTranslationUnit, IndexFormatCa
   llvm::SmallString<256> IndexFileName;
   ASSERT_FALSE(llvm::sys::fs::createTemporaryFile("index", "txt", IndexFD,
                                                   IndexFileName));
-  llvm::tool_output_file IndexFile(IndexFileName, IndexFD);
+  llvm::ToolOutputFile IndexFile(IndexFileName, IndexFD);
   IndexFile.os() << IndexText;
   IndexFile.os().flush();
   EXPECT_TRUE(llvm::sys::fs::exists(IndexFileName));

Modified: cfe/trunk/unittests/Frontend/ASTUnitTest.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Frontend/ASTUnitTest.cpp?rev=314051&r1=314050&r2=314051&view=diff
==============================================================================
--- cfe/trunk/unittests/Frontend/ASTUnitTest.cpp (original)
+++ cfe/trunk/unittests/Frontend/ASTUnitTest.cpp Fri Sep 22 18:04:42 2017
@@ -41,7 +41,7 @@ TEST(ASTUnit, SaveLoadPreservesLangOptio
   int FD;
   llvm::SmallString<256> InputFileName;
   ASSERT_FALSE(llvm::sys::fs::createTemporaryFile("ast-unit", "cpp", FD, InputFileName));
-  tool_output_file input_file(InputFileName, FD);
+  ToolOutputFile input_file(InputFileName, FD);
   input_file.os() << "";
 
   const char* Args[] = {"clang", "-xc++", InputFileName.c_str()};
@@ -69,7 +69,7 @@ TEST(ASTUnit, SaveLoadPreservesLangOptio
 
   llvm::SmallString<256> ASTFileName;
   ASSERT_FALSE(llvm::sys::fs::createTemporaryFile("ast-unit", "ast", FD, ASTFileName));
-  tool_output_file ast_file(ASTFileName, FD);
+  ToolOutputFile ast_file(ASTFileName, FD);
   AST->Save(ASTFileName.str());
 
   EXPECT_TRUE(llvm::sys::fs::exists(ASTFileName));

Modified: cfe/trunk/unittests/Frontend/CompilerInstanceTest.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Frontend/CompilerInstanceTest.cpp?rev=314051&r1=314050&r2=314051&view=diff
==============================================================================
--- cfe/trunk/unittests/Frontend/CompilerInstanceTest.cpp (original)
+++ cfe/trunk/unittests/Frontend/CompilerInstanceTest.cpp Fri Sep 22 18:04:42 2017
@@ -24,7 +24,7 @@ TEST(CompilerInstance, DefaultVFSOverlay
   int FD;
   SmallString<256> FileName;
   ASSERT_FALSE(sys::fs::createTemporaryFile("vfs", "yaml", FD, FileName));
-  tool_output_file File(FileName, FD);
+  ToolOutputFile File(FileName, FD);
 
   SmallString<256> CurrentPath;
   sys::fs::current_path(CurrentPath);




More information about the cfe-commits mailing list