Revert "cpp11-migrate: Fixing autoconf build after adding libclangReplace dependency"

Revert "cpp11-migrate: Refactor for driver model of operation"

This reverts commit r189691.
This reverts commit r189689.

This was breaking the phase 1 OS X build for ~2 hours.

https://smooshbase.apple.com/buildbot-internal/builders/phase1%20-%20sanity/builds/9559

I reverted the latter commit since I think the latter depended on the former.

llvm-svn: 189700

1 files changed, 19 insertions, 16 deletions

diff --git a/clang-tools-extra/unittests/cpp11-migrate/UniqueHeaderNameTest.cpp b/clang-tools-extra/unittests/cpp11-migrate/UniqueHeaderNameTest.cpp
index a2d70e03baa..0323222c03c 100644
--- a/clang-tools-extra/unittests/cpp11-migrate/UniqueHeaderNameTest.cpp
+++ b/clang-tools-extra/unittests/cpp11-migrate/UniqueHeaderNameTest.cpp
@@ -28,31 +28,34 @@ TEST(UniqueHeaderName, testUniqueHeaderName) {
   append(SourceFile, "project/lib/feature.cpp");
   native(SourceFile.str().str(), SourceFile);
 
-  llvm::SmallString<128> FullActualPath;
+  llvm::SmallString<128> HeaderFile(TmpDir);
+  append(HeaderFile, "project/include/feature.h");
+  native(HeaderFile.str().str(), HeaderFile);
+
+  llvm::SmallString<128> ExpectedName("^feature.cpp_feature.h_[0-9a-f]{2}_[0-9a-f]{2}_[0-9a-f]{2}_[0-9a-f]{2}_[0-9a-f]{2}_[0-9a-f]{2}.yaml$");
+
+  llvm::SmallString<128> ActualName;
   llvm::SmallString<128> Error;
   bool Result =
-      generateReplacementsFileName(SourceFile, FullActualPath, Error);
+      generateReplacementsFileName(SourceFile, HeaderFile, ActualName, Error);
 
   ASSERT_TRUE(Result);
   EXPECT_TRUE(Error.empty());
 
   // We need to check the directory name and filename separately since on
   // Windows, the path separator is '\' which is a regex escape character.
-  llvm::SmallString<128> ExpectedPath =
-      llvm::sys::path::parent_path(SourceFile);
-  llvm::SmallString<128> ActualPath =
-      llvm::sys::path::parent_path(FullActualPath);
-  llvm::SmallString<128> ActualName =
-      llvm::sys::path::filename(FullActualPath);
-
-  EXPECT_STREQ(ExpectedPath.c_str(), ActualPath.c_str());
-
-  llvm::StringRef ExpectedName =
-      "^feature.cpp_[0-9a-f]{2}_[0-9a-f]{2}_[0-9a-f]{2}_[0-9a-f]{2}_["
-      "0-9a-f]{2}_[0-9a-f]{2}.yaml$";
+  llvm::SmallString<128> ExpectedHeaderPath =
+      llvm::sys::path::parent_path(HeaderFile);
+  llvm::SmallString<128> ActualHeaderPath =
+      llvm::sys::path::parent_path(ActualName);
+  llvm::SmallString<128> ActualHeaderName =
+      llvm::sys::path::filename(ActualName);
+
+  EXPECT_STREQ(ExpectedHeaderPath.c_str(), ActualHeaderPath.c_str());
+
   llvm::Regex R(ExpectedName);
-  ASSERT_TRUE(R.match(ActualName))
-      << "ExpectedName: " << ExpectedName.data()
+  ASSERT_TRUE(R.match(ActualHeaderName))
+      << "ExpectedName: " << ExpectedName.c_str()
       << "\nActualName: " << ActualName.c_str();
   ASSERT_TRUE(Error.empty()) << "Error: " << Error.c_str();
 }