commit e40e7362ba4208d45fb88525361a7de2fad4bb91
author Thiébaud Weksteen <tweek@google.com> Wed Oct 28 15:03:00 2020 +0100
committer Thiébaud Weksteen <tweek@google.com> Wed Oct 28 15:05:11 2020 +0100
tree ac7a6b83ef63396cc1f9af214c18bb0892b55c80
parent 983137f038c4d4b95a0cd86b7c42d0313b50de67

Importing rustc-1.47.0

Bug: 171280890
Change-Id: Iac01e5c09a6ae8e508762cd96c2a88d191af4f0e

src/llvm-project/llvm/unittests/Support/SpecialCaseListTest.cpp

diff --git a/src/llvm-project/llvm/unittests/Support/SpecialCaseListTest.cpp b/src/llvm-project/llvm/unittests/Support/SpecialCaseListTest.cpp
index de1f058..bee639d 100644
--- a/src/llvm-project/llvm/unittests/Support/SpecialCaseListTest.cpp
+++ b/src/llvm-project/llvm/unittests/Support/SpecialCaseListTest.cpp
@@ -39,7 +39,7 @@
     raw_fd_ostream OF(FD, true, true);
     OF << Contents;
     OF.close();
-    return Path.str();
+    return std::string(Path.str());
   }
 };
 
@@ -172,7 +172,7 @@
   EXPECT_FALSE(SCL->inSection("", "foo", "bar"));
 }
 
-TEST_F(SpecialCaseListTest, MultipleBlacklists) {
+TEST_F(SpecialCaseListTest, MultipleExclusions) {
   std::vector<std::string> Files;
   Files.push_back(makeSpecialCaseListFile("src:bar\n"
                                           "src:*foo*\n"