From e773b4325382319cf0f97808c1153b4b6673605a Mon Sep 17 00:00:00 2001 From: temporal Date: Wed, 16 Jul 2008 20:57:56 +0000 Subject: Allow trailing slashes in --proto_path mappings. Patch by Kevin Ko . --- src/google/protobuf/compiler/importer_unittest.cc | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/google/protobuf/compiler/importer_unittest.cc') diff --git a/src/google/protobuf/compiler/importer_unittest.cc b/src/google/protobuf/compiler/importer_unittest.cc index 5b5d2831..55c52e47 100644 --- a/src/google/protobuf/compiler/importer_unittest.cc +++ b/src/google/protobuf/compiler/importer_unittest.cc @@ -492,6 +492,7 @@ TEST_F(DiskSourceTreeTest, DiskFileToVirtualFileCanonicalization) { source_tree_.MapPath("dir3", "./foo/bar/."); source_tree_.MapPath("dir4", "."); source_tree_.MapPath("", "/qux"); + source_tree_.MapPath("dir5", "/quux/"); string virtual_file; string shadowing_disk_file; @@ -530,6 +531,12 @@ TEST_F(DiskSourceTreeTest, DiskFileToVirtualFileCanonicalization) { source_tree_.DiskFileToVirtualFile( "/qux/baz", &virtual_file, &shadowing_disk_file)); EXPECT_EQ("baz", virtual_file); + + // "/quux/bar" is under "/quux". + EXPECT_EQ(DiskSourceTree::CANNOT_OPEN, + source_tree_.DiskFileToVirtualFile( + "/quux/bar", &virtual_file, &shadowing_disk_file)); + EXPECT_EQ("dir5/bar", virtual_file); } } // namespace -- cgit v1.2.3