Author: labath Date: Thu Apr 14 04:38:06 2016 New Revision: 266286 URL: http://llvm.org/viewvc/llvm-project?rev=266286&view=rev Log: 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 Modified: lldb/trunk/source/Host/common/FileSpec.cpp lldb/trunk/unittests/Host/FileSpecTest.cpp Modified: lldb/trunk/source/Host/common/FileSpec.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/common/FileSpec.cpp?rev=266286&r1=266285&r2=266286&view=diff ============================================================================== --- lldb/trunk/source/Host/common/FileSpec.cpp (original) +++ lldb/trunk/source/Host/common/FileSpec.cpp Thu Apr 14 04:38:06 2016 @@ -394,6 +394,8 @@ FileSpec::SetFile (const char *pathname, m_is_resolved = true; } + Normalize(resolved, syntax); + llvm::StringRef resolve_path_ref(resolved.c_str()); size_t dir_end = ParentPathEnd(resolve_path_ref, syntax); if (dir_end == 0) Modified: lldb/trunk/unittests/Host/FileSpecTest.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/Host/FileSpecTest.cpp?rev=266286&r1=266285&r2=266286&view=diff ============================================================================== --- lldb/trunk/unittests/Host/FileSpecTest.cpp (original) +++ lldb/trunk/unittests/Host/FileSpecTest.cpp Thu Apr 14 04:38:06 2016 @@ -22,7 +22,7 @@ TEST(FileSpecTest, FileAndDirectoryCompo 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, FileAndDirectoryCompo 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, FileAndDirectoryCompo 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, FileAndDirectoryCompo 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, CopyByAppendingPathCo 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)); +} _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
