summaryrefslogtreecommitdiffstats
path: root/lldb/unittests/Host/FileSpecTest.cpp
diff options
context:
space:
mode:
authorPavel Labath <labath@google.com>2016-04-14 09:38:06 +0000
committerPavel Labath <labath@google.com>2016-04-14 09:38:06 +0000
commita212c58db07b31311e2e7f6a76bf444ccc482f16 (patch)
tree4f11cebe6de413e918d37c3e4679e0c68ddfb49d /lldb/unittests/Host/FileSpecTest.cpp
parentd10ce392540a9121c16916c2cf23f1843131247b (diff)
downloadbcm5719-llvm-a212c58db07b31311e2e7f6a76bf444ccc482f16.tar.gz
bcm5719-llvm-a212c58db07b31311e2e7f6a76bf444ccc482f16.zip
FileSpec: make matching separator-agnostic again
Summary: In D18689, I removed the call to Normalize() in FileSpec::SetFile, because it no longer seemed needed, and it resolved a quirk in the FileSpec API (spec.GetCString() returnes a path with backslashes, but spec.GetDirectory().GetCString() has forward slashes). This turned out to be a problem because we would consider paths with different separators as different (which led to unresolved breakpoints for instance). Here, I am putting back in the call to Normalize() and adding a unittest for FileSpec::Equal. I am commenting out the GetDirectory unittests until we figure out the what is the expected behaviour here. Reviewers: zturner Subscribers: lldb-commits Differential Revision: http://reviews.llvm.org/D19060 llvm-svn: 266286
Diffstat (limited to 'lldb/unittests/Host/FileSpecTest.cpp')
-rw-r--r--lldb/unittests/Host/FileSpecTest.cpp26
1 files changed, 20 insertions, 6 deletions
diff --git a/lldb/unittests/Host/FileSpecTest.cpp b/lldb/unittests/Host/FileSpecTest.cpp
index ea5f0d9b157..4e619529773 100644
--- a/lldb/unittests/Host/FileSpecTest.cpp
+++ b/lldb/unittests/Host/FileSpecTest.cpp
@@ -22,7 +22,7 @@ TEST(FileSpecTest, FileAndDirectoryComponents)
FileSpec fs_windows("F:\\bar", false, FileSpec::ePathSyntaxWindows);
EXPECT_STREQ("F:\\bar", fs_windows.GetCString());
- EXPECT_STREQ("F:\\", fs_windows.GetDirectory().GetCString());
+ // EXPECT_STREQ("F:\\", fs_windows.GetDirectory().GetCString()); // It returns "F:/"
EXPECT_STREQ("bar", fs_windows.GetFilename().GetCString());
FileSpec fs_posix_root("/", false, FileSpec::ePathSyntaxPosix);
@@ -38,7 +38,7 @@ TEST(FileSpecTest, FileAndDirectoryComponents)
FileSpec fs_windows_root("F:\\", false, FileSpec::ePathSyntaxWindows);
EXPECT_STREQ("F:\\", fs_windows_root.GetCString());
EXPECT_STREQ("F:", fs_windows_root.GetDirectory().GetCString());
- EXPECT_STREQ("\\", fs_windows_root.GetFilename().GetCString());
+ // EXPECT_STREQ("\\", fs_windows_root.GetFilename().GetCString()); // It returns "/"
FileSpec fs_posix_long("/foo/bar/baz", false, FileSpec::ePathSyntaxPosix);
EXPECT_STREQ("/foo/bar/baz", fs_posix_long.GetCString());
@@ -47,7 +47,7 @@ TEST(FileSpecTest, FileAndDirectoryComponents)
FileSpec fs_windows_long("F:\\bar\\baz", false, FileSpec::ePathSyntaxWindows);
EXPECT_STREQ("F:\\bar\\baz", fs_windows_long.GetCString());
- EXPECT_STREQ("F:\\bar", fs_windows_long.GetDirectory().GetCString());
+ // EXPECT_STREQ("F:\\bar", fs_windows_long.GetDirectory().GetCString()); // It returns "F:/bar"
EXPECT_STREQ("baz", fs_windows_long.GetFilename().GetCString());
FileSpec fs_posix_trailing_slash("/foo/bar/", false, FileSpec::ePathSyntaxPosix);
@@ -57,7 +57,7 @@ TEST(FileSpecTest, FileAndDirectoryComponents)
FileSpec fs_windows_trailing_slash("F:\\bar\\", false, FileSpec::ePathSyntaxWindows);
EXPECT_STREQ("F:\\bar\\.", fs_windows_trailing_slash.GetCString());
- EXPECT_STREQ("F:\\bar", fs_windows_trailing_slash.GetDirectory().GetCString());
+ // EXPECT_STREQ("F:\\bar", fs_windows_trailing_slash.GetDirectory().GetCString()); // It returns "F:/bar"
EXPECT_STREQ(".", fs_windows_trailing_slash.GetFilename().GetCString());
}
@@ -72,7 +72,7 @@ TEST(FileSpecTest, AppendPathComponent)
FileSpec fs_windows("F:\\bar", false, FileSpec::ePathSyntaxWindows);
fs_windows.AppendPathComponent("baz");
EXPECT_STREQ("F:\\bar\\baz", fs_windows.GetCString());
- EXPECT_STREQ("F:\\bar", fs_windows.GetDirectory().GetCString());
+ // EXPECT_STREQ("F:\\bar", fs_windows.GetDirectory().GetCString()); // It returns "F:/bar"
EXPECT_STREQ("baz", fs_windows.GetFilename().GetCString());
FileSpec fs_posix_root("/", false, FileSpec::ePathSyntaxPosix);
@@ -84,7 +84,7 @@ TEST(FileSpecTest, AppendPathComponent)
FileSpec fs_windows_root("F:\\", false, FileSpec::ePathSyntaxWindows);
fs_windows_root.AppendPathComponent("bar");
EXPECT_STREQ("F:\\bar", fs_windows_root.GetCString());
- EXPECT_STREQ("F:\\", fs_windows_root.GetDirectory().GetCString());
+ // EXPECT_STREQ("F:\\", fs_windows_root.GetDirectory().GetCString()); // It returns "F:/"
EXPECT_STREQ("bar", fs_windows_root.GetFilename().GetCString());
}
@@ -95,3 +95,17 @@ TEST(FileSpecTest, CopyByAppendingPathComponent)
EXPECT_STREQ("/foo", fs.GetDirectory().GetCString());
EXPECT_STREQ("bar", fs.GetFilename().GetCString());
}
+
+TEST(FileSpecTest, Equal)
+{
+ FileSpec backward("C:\\foo\\bar", false, FileSpec::ePathSyntaxWindows);
+ FileSpec forward("C:/foo/bar", false, FileSpec::ePathSyntaxWindows);
+ EXPECT_EQ(forward, backward);
+
+ const bool full_match = true;
+ const bool remove_backup_dots = true;
+ EXPECT_TRUE(FileSpec::Equal(forward, backward, full_match, remove_backup_dots));
+ EXPECT_TRUE(FileSpec::Equal(forward, backward, full_match, !remove_backup_dots));
+ EXPECT_TRUE(FileSpec::Equal(forward, backward, !full_match, remove_backup_dots));
+ EXPECT_TRUE(FileSpec::Equal(forward, backward, !full_match, !remove_backup_dots));
+}
OpenPOWER on IntegriCloud