6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-20 10:24:12 +00:00
Code Issues Projects Releases Wiki Activity

[Support] Make sure LockFileManager works correctly with relative paths.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@204426 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Argyrios Kyrtzidis
2014-03-21 02:31:56 +00:00
parent c53b3dbc20
commit fb307be5af
2 changed files with 40 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Support/LockFileManager.cpp
View File

@ -11,6 +11,7 @@
#include "llvm/ADT/StringExtras.h" #include "llvm/ADT/StringExtras.h"
#include "llvm/Support/FileSystem.h" #include "llvm/Support/FileSystem.h"
#include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/MemoryBuffer.h"
#include "llvm/Support/Path.h"
#include "llvm/Support/raw_ostream.h" #include "llvm/Support/raw_ostream.h"
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
@ -115,7 +116,8 @@ LockFileManager::LockFileManager(StringRef FileName)
while (1) { while (1) {
// Create a link from the lock file name. If this succeeds, we're done. // Create a link from the lock file name. If this succeeds, we're done.
error_code EC = error_code EC =
sys::fs::create_link(UniqueLockFileName.str(), LockFileName.str()); sys::fs::create_link(sys::path::filename(UniqueLockFileName.str()),
LockFileName.str());
if (EC == errc::success) if (EC == errc::success)
return; return;

37
unittests/Support/LockFileManagerTest.cpp
View File

@ -76,4 +76,41 @@ TEST(LockFileManagerTest, LinkLockExists) {
ASSERT_FALSE(EC); ASSERT_FALSE(EC);
} }
TEST(LockFileManagerTest, RelativePath) {
SmallString<64> TmpDir;
error_code EC;
EC = sys::fs::createUniqueDirectory("LockFileManagerTestDir", TmpDir);
ASSERT_FALSE(EC);
char PathBuf[1024];
const char *OrigPath = getcwd(PathBuf, 1024);
chdir(TmpDir.c_str());
sys::fs::create_directory("inner");
SmallString<64> LockedFile("inner");
sys::path::append(LockedFile, "file");
SmallString<64> FileLock(LockedFile);
FileLock += ".lock";
{
// The lock file should not exist, so we should successfully acquire it.
LockFileManager Locked(LockedFile);
EXPECT_EQ(LockFileManager::LFS_Owned, Locked.getState());
EXPECT_TRUE(sys::fs::exists(FileLock.str()));
}
// Now that the lock is out of scope, the file should be gone.
EXPECT_FALSE(sys::fs::exists(LockedFile.str()));
EXPECT_FALSE(sys::fs::exists(FileLock.str()));
EC = sys::fs::remove("inner");
ASSERT_FALSE(EC);
EC = sys::fs::remove(StringRef(TmpDir));
ASSERT_FALSE(EC);
chdir(OrigPath);
}
} // end anonymous namespace } // end anonymous namespace