Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2024-11-27 23:51:56 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Revert "sys::Path::GetCurrentDirectory has been removed. Use sys::fs::current_path."

Browse Source 
This reverts commit r184004.

This test has some dependency on the behavior of the old function on windows. I
added it back to llvm for now.

llvm-svn: 184010
This commit is contained in:
Rafael Espindola 2013-06-14 21:44:06 +00:00
parent 158d537c5a
commit f7d00ba592
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
clang-tools-extra/unittests/cpp11-migrate/TransformTest.cpp
View File

@ -2,7 +2,6 @@
#include "Core/Transform.h"
#include "clang/AST/ASTConsumer.h"
#include "clang/AST/DeclGroup.h"
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/Process.h"
#include "llvm/Support/Path.h"
#include "llvm/Support/PathV1.h"
@ -99,24 +98,22 @@ TEST(Transform, Timings) {
// The directory used is not important since the path gets mapped to a virtual
// file anyway. What is important is that we have an absolute path with which
// to use with mapVirtualFile().
SmallString<128> CurrentDir;
llvm::error_code EC = llvm::sys::fs::current_path(CurrentDir);
EXPECT_FALSE(EC);
llvm::sys::Path FileA = llvm::sys::Path::GetCurrentDirectory();
std::string CurrentDir = FileA.str();
FileA.appendComponent("a.cc");
std::string FileAName = FileA.str();
llvm::sys::Path FileB = llvm::sys::Path::GetCurrentDirectory();
FileB.appendComponent("b.cc");
std::string FileBName = FileB.str();
SmallString<128> FileA = CurrentDir;
llvm::sys::path::append(FileA, "a.cc");
SmallString<128> FileB = CurrentDir;
llvm::sys::path::append(FileB, "b.cc");
tooling::FixedCompilationDatabase Compilations(CurrentDir.str(), std::vector<std::string>());
tooling::FixedCompilationDatabase Compilations(CurrentDir, std::vector<std::string>());
std::vector<std::string> Sources;
Sources.push_back(FileA.str());
Sources.push_back(FileB.str());
Sources.push_back(FileAName);
Sources.push_back(FileBName);
tooling::ClangTool Tool(Compilations, Sources);
Tool.mapVirtualFile(FileA, "void a() {}");
Tool.mapVirtualFile(FileB, "void b() {}");
Tool.mapVirtualFile(FileAName, "void a() {}");
Tool.mapVirtualFile(FileBName, "void b() {}");
ConsumerFactory Factory;
Tool.run(newFrontendActionFactory(&Factory, &T));
@ -128,13 +125,13 @@ TEST(Transform, Timings) {
// The success of the test shouldn't depend on the order of iteration through
// timers.
llvm::sys::Path FirstFile(I->first);
if (FileA == FirstFile.str()) {
if (FileA == FirstFile) {
++I;
EXPECT_EQ(FileB, llvm::sys::Path(I->first).str());
EXPECT_EQ(FileB, llvm::sys::Path(I->first));
EXPECT_GT(I->second.getProcessTime(), 0.0);
} else if (FileB == FirstFile.str()) {
} else if (FileB == FirstFile) {
++I;
EXPECT_EQ(FileA, llvm::sys::Path(I->first).str());
EXPECT_EQ(FileA, llvm::sys::Path(I->first));
EXPECT_GT(I->second.getProcessTime(), 0.0);
} else {
FAIL() << "Unexpected file name " << I->first << " in timing data.";