diff --git a/llvm/unittests/CMakeLists.txt b/llvm/unittests/CMakeLists.txt --- a/llvm/unittests/CMakeLists.txt +++ b/llvm/unittests/CMakeLists.txt @@ -14,6 +14,8 @@ add_llvm_unittest(${test_dir_name} DISABLE_LLVM_LINK_LLVM_DYLIB ${ARGN}) endfunction() +include_directories(${LLVM_MAIN_SRC_DIR}/utils/unittest/support) + add_subdirectory(ADT) add_subdirectory(Analysis) add_subdirectory(AsmParser) diff --git a/llvm/unittests/ProfileData/SampleProfTest.cpp b/llvm/unittests/ProfileData/SampleProfTest.cpp --- a/llvm/unittests/ProfileData/SampleProfTest.cpp +++ b/llvm/unittests/ProfileData/SampleProfTest.cpp @@ -286,6 +286,9 @@ Summary.setPartialProfile(true); Summary.setPartialProfileRatio(0.5); verifyProfileSummary(Summary, M, true, true); + + sys::fs::remove(RemapFile); + sys::fs::remove(Profile); } void addFunctionSamples(StringMap *Smap, const char *Fname, @@ -358,6 +361,8 @@ Esamples = Samples->getTotalSamples(); ASSERT_EQ(I->getValue(), Esamples); } + + sys::fs::remove(ProfileFile); } }; diff --git a/llvm/unittests/Support/FileCollectorTest.cpp b/llvm/unittests/Support/FileCollectorTest.cpp --- a/llvm/unittests/Support/FileCollectorTest.cpp +++ b/llvm/unittests/Support/FileCollectorTest.cpp @@ -6,6 +6,7 @@ // //===----------------------------------------------------------------------===// +#include "llvm-test-helper.h" #include "gmock/gmock.h" #include "gtest/gtest.h" @@ -13,6 +14,9 @@ #include "llvm/Support/FileSystem.h" using namespace llvm; +using llvm::test_helper::ScopedDir; +using llvm::test_helper::ScopedFile; +using llvm::test_helper::ScopedLink; namespace llvm { namespace vfs { @@ -37,66 +41,6 @@ } }; -struct ScopedDir { - SmallString<128> Path; - ScopedDir(const Twine &Name, bool Unique = false) { - std::error_code EC; - if (Unique) { - EC = llvm::sys::fs::createUniqueDirectory(Name, Path); - } else { - Path = Name.str(); - EC = llvm::sys::fs::create_directory(Twine(Path)); - } - if (EC) - Path = ""; - EXPECT_FALSE(EC); - // Ensure the path is the real path so tests can use it to compare against - // realpath output. - SmallString<128> RealPath; - if (!llvm::sys::fs::real_path(Path, RealPath)) - Path.swap(RealPath); - } - ~ScopedDir() { - if (Path != "") { - EXPECT_FALSE(llvm::sys::fs::remove_directories(Path.str())); - } - } - operator StringRef() { return Path.str(); } -}; - -struct ScopedLink { - SmallString<128> Path; - ScopedLink(const Twine &To, const Twine &From) { - Path = From.str(); - std::error_code EC = sys::fs::create_link(To, From); - if (EC) - Path = ""; - EXPECT_FALSE(EC); - } - ~ScopedLink() { - if (Path != "") { - EXPECT_FALSE(llvm::sys::fs::remove(Path.str())); - } - } - operator StringRef() { return Path.str(); } -}; - -struct ScopedFile { - SmallString<128> Path; - ScopedFile(const Twine &Name) { - std::error_code EC; - EC = llvm::sys::fs::createUniqueFile(Name, Path); - if (EC) - Path = ""; - EXPECT_FALSE(EC); - } - ~ScopedFile() { - if (Path != "") { - EXPECT_FALSE(llvm::sys::fs::remove(Path.str())); - } - } - operator StringRef() { return Path.str(); } -}; } // end anonymous namespace TEST(FileCollectorTest, addFile) { diff --git a/llvm/unittests/Support/FileUtilitiesTest.cpp b/llvm/unittests/Support/FileUtilitiesTest.cpp --- a/llvm/unittests/Support/FileUtilitiesTest.cpp +++ b/llvm/unittests/Support/FileUtilitiesTest.cpp @@ -7,6 +7,7 @@ //===----------------------------------------------------------------------===// #include "llvm/Support/FileUtilities.h" +#include "llvm-test-helper.h" #include "llvm/Support/Errc.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/FileSystem.h" @@ -18,6 +19,8 @@ using namespace llvm; using namespace llvm::sys; +using llvm::test_helper::ScopedDir; + #define ASSERT_NO_ERROR(x) \ if (std::error_code ASSERT_NO_ERROR_ec = x) { \ SmallString<128> MessageStorage; \ @@ -32,9 +35,7 @@ namespace { TEST(writeFileAtomicallyTest, Test) { // Create unique temporary directory for these tests - SmallString<128> RootTestDirectory; - ASSERT_NO_ERROR( - fs::createUniqueDirectory("writeFileAtomicallyTest", RootTestDirectory)); + ScopedDir RootTestDirectory("writeFileAtomicallyTest", /*Unique*/ true); SmallString<128> FinalTestfilePath(RootTestDirectory); sys::path::append(FinalTestfilePath, "foo.txt"); diff --git a/llvm/unittests/Support/TarWriterTest.cpp b/llvm/unittests/Support/TarWriterTest.cpp --- a/llvm/unittests/Support/TarWriterTest.cpp +++ b/llvm/unittests/Support/TarWriterTest.cpp @@ -138,6 +138,7 @@ EC = sys::fs::file_size(Path, TarSize); EXPECT_FALSE((bool)EC); EXPECT_EQ(TarSize, 2048ULL); + sys::fs::remove(Path); } TEST_F(TarWriterTest, NoDuplicate) { @@ -157,6 +158,7 @@ EC = sys::fs::file_size(Path, TarSize); EXPECT_FALSE((bool)EC); EXPECT_EQ(TarSize, 3072ULL); + sys::fs::remove(Path); } TEST_F(TarWriterTest, Duplicate) { @@ -176,5 +178,6 @@ EC = sys::fs::file_size(Path, TarSize); EXPECT_FALSE((bool)EC); EXPECT_EQ(TarSize, 2048ULL); + sys::fs::remove(Path); } } // namespace diff --git a/llvm/unittests/Support/VirtualFileSystemTest.cpp b/llvm/unittests/Support/VirtualFileSystemTest.cpp --- a/llvm/unittests/Support/VirtualFileSystemTest.cpp +++ b/llvm/unittests/Support/VirtualFileSystemTest.cpp @@ -7,6 +7,7 @@ //===----------------------------------------------------------------------===// #include "llvm/Support/VirtualFileSystem.h" +#include "llvm-test-helper.h" #include "llvm/ADT/Triple.h" #include "llvm/Config/llvm-config.h" #include "llvm/Support/Errc.h" @@ -21,6 +22,9 @@ using namespace llvm; using llvm::sys::fs::UniqueID; +using llvm::test_helper::ScopedDir; +using llvm::test_helper::ScopedFile; +using llvm::test_helper::ScopedLink; using testing::ElementsAre; using testing::Pair; using testing::UnorderedElementsAre; @@ -410,72 +414,6 @@ } } -namespace { -struct ScopedDir { - SmallString<128> Path; - ScopedDir(const Twine &Name, bool Unique = false) { - std::error_code EC; - if (Unique) { - EC = llvm::sys::fs::createUniqueDirectory(Name, Path); - if (!EC) { - // Resolve any symlinks in the new directory. - std::string UnresolvedPath = std::string(Path.str()); - EC = llvm::sys::fs::real_path(UnresolvedPath, Path); - } - } else { - Path = Name.str(); - EC = llvm::sys::fs::create_directory(Twine(Path)); - } - if (EC) - Path = ""; - EXPECT_FALSE(EC) << EC.message(); - } - ~ScopedDir() { - if (Path != "") { - EXPECT_FALSE(llvm::sys::fs::remove(Path.str())); - } - } - operator StringRef() { return Path.str(); } -}; - -struct ScopedLink { - SmallString<128> Path; - ScopedLink(const Twine &To, const Twine &From) { - Path = From.str(); - std::error_code EC = sys::fs::create_link(To, From); - if (EC) - Path = ""; - EXPECT_FALSE(EC); - } - ~ScopedLink() { - if (Path != "") { - EXPECT_FALSE(llvm::sys::fs::remove(Path.str())); - } - } - operator StringRef() { return Path.str(); } -}; - -struct ScopedFile { - SmallString<128> Path; - ScopedFile(const Twine &Path, StringRef Contents) { - Path.toVector(this->Path); - std::error_code EC; - raw_fd_ostream OS(this->Path, EC); - EXPECT_FALSE(EC); - OS << Contents; - OS.flush(); - EXPECT_FALSE(OS.error()); - if (EC || OS.error()) - this->Path = ""; - } - ~ScopedFile() { - if (Path != "") { - EXPECT_FALSE(llvm::sys::fs::remove(Path.str())); - } - } -}; -} // end anonymous namespace - TEST(VirtualFileSystemTest, BasicRealFSIteration) { ScopedDir TestDirectory("virtual-file-system-test", /*Unique*/ true); IntrusiveRefCntPtr FS = vfs::getRealFileSystem(); diff --git a/llvm/unittests/tools/llvm-exegesis/Mips/BenchmarkResultTest.cpp b/llvm/unittests/tools/llvm-exegesis/Mips/BenchmarkResultTest.cpp --- a/llvm/unittests/tools/llvm-exegesis/Mips/BenchmarkResultTest.cpp +++ b/llvm/unittests/tools/llvm-exegesis/Mips/BenchmarkResultTest.cpp @@ -9,6 +9,7 @@ #include "BenchmarkResult.h" #include "MipsInstrInfo.h" #include "TestBase.h" +#include "llvm-test-helper.h" #include "llvm/ADT/SmallString.h" #include "llvm/Support/Error.h" #include "llvm/Support/Path.h" @@ -25,6 +26,8 @@ using ::testing::Pointwise; using ::testing::Property; +using llvm::test_helper::ScopedDir; + namespace llvm { namespace exegesis { @@ -76,10 +79,8 @@ ToDisk.Error = "error"; ToDisk.Info = "info"; - SmallString<64> Filename; - std::error_code EC; - EC = sys::fs::createUniqueDirectory("BenchmarkResultTestDir", Filename); - ASSERT_FALSE(EC); + ScopedDir TestDirectory("BenchmarkResultTestDir", /*Unique*/ true); + SmallString<64> Filename(TestDirectory); sys::path::append(Filename, "data.yaml"); errs() << Filename << "-------\n"; ExitOnErr(ToDisk.writeYaml(State, Filename)); diff --git a/llvm/unittests/tools/llvm-exegesis/X86/SnippetFileTest.cpp b/llvm/unittests/tools/llvm-exegesis/X86/SnippetFileTest.cpp --- a/llvm/unittests/tools/llvm-exegesis/X86/SnippetFileTest.cpp +++ b/llvm/unittests/tools/llvm-exegesis/X86/SnippetFileTest.cpp @@ -11,6 +11,7 @@ #include "LlvmState.h" #include "TestBase.h" #include "X86InstrInfo.h" +#include "llvm-test-helper.h" #include "llvm/Support/Error.h" #include "llvm/Support/FileSystem.h" #include "llvm/Support/Path.h" @@ -34,16 +35,17 @@ using testing::Property; using testing::SizeIs; +using llvm::test_helper::ScopedDir; + class X86SnippetFileTest : public X86TestBase { protected: Expected> TestCommon(StringRef Contents) { - SmallString<64> Filename; - std::error_code EC; - EC = sys::fs::createUniqueDirectory("SnippetFileTestDir", Filename); - EXPECT_FALSE(EC); + ScopedDir TestDirectory("SnippetFileTestDir", /*Unique*/ true); + SmallString<64> Filename(TestDirectory); sys::path::append(Filename, "snippet.s"); errs() << Filename << "-------\n"; { + std::error_code EC; raw_fd_ostream FOS(Filename, EC); FOS << Contents; EXPECT_FALSE(EC); diff --git a/llvm/utils/unittest/support/llvm-test-helper.h b/llvm/utils/unittest/support/llvm-test-helper.h new file mode 100644 --- /dev/null +++ b/llvm/utils/unittest/support/llvm-test-helper.h @@ -0,0 +1,94 @@ +//===-- llvm-test-helper.cpp ------------------------------------*- C++ -*-===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +#include "gtest/gtest.h" + +#include "llvm/Support/FileSystem.h" + +namespace llvm { + +namespace test_helper { + +struct ScopedDir { + SmallString<128> Path; + ScopedDir(const Twine &Name, bool Unique = false) { + std::error_code EC; + if (Unique) { + EC = llvm::sys::fs::createUniqueDirectory(Name, Path); + if (!EC) { + // Resolve any symlinks in the new directory. + std::string UnresolvedPath = std::string(Path.str()); + EC = llvm::sys::fs::real_path(UnresolvedPath, Path); + } + } else { + Path = Name.str(); + EC = llvm::sys::fs::create_directory(Twine(Path)); + } + if (EC) + Path = ""; + EXPECT_FALSE(EC) << EC.message(); + } + ~ScopedDir() { + if (Path != "") { + EXPECT_FALSE(llvm::sys::fs::remove_directories(Path.str())); + } + } + operator StringRef() { return Path.str(); } +}; + +struct ScopedLink { + SmallString<128> Path; + ScopedLink(const Twine &To, const Twine &From) { + Path = From.str(); + std::error_code EC = sys::fs::create_link(To, From); + if (EC) + Path = ""; + EXPECT_FALSE(EC); + } + ~ScopedLink() { + if (Path != "") { + EXPECT_FALSE(llvm::sys::fs::remove(Path.str())); + } + } + operator StringRef() { return Path.str(); } +}; + +struct ScopedFile { + SmallString<128> Path; + + ScopedFile(const Twine &Name) { + std::error_code EC; + EC = llvm::sys::fs::createUniqueFile(Name, Path); + if (EC) + Path = ""; + EXPECT_FALSE(EC); + } + + ScopedFile(const Twine &Path, StringRef Contents) { + Path.toVector(this->Path); + std::error_code EC; + raw_fd_ostream OS(this->Path, EC); + EXPECT_FALSE(EC); + OS << Contents; + OS.flush(); + EXPECT_FALSE(OS.error()); + if (EC || OS.error()) + this->Path = ""; + } + ~ScopedFile() { + if (Path != "") { + EXPECT_FALSE(llvm::sys::fs::remove(Path.str())); + } + } + + operator StringRef() { return Path.str(); } +}; + +} // end namespace test_helper + +} // end namespace llvm