diff options
author | Scott Graham <scottmg@chromium.org> | 2014-11-09 06:49:21 (GMT) |
---|---|---|
committer | Scott Graham <scottmg@chromium.org> | 2014-11-09 06:49:21 (GMT) |
commit | 559389de082406f44ae752a2494e53000d31a7df (patch) | |
tree | 3b82939a355ae91662c605b35e739e7f032db6e6 /src/util_test.cc | |
parent | 8177085f4d3adf78b9709069a9c3ce5fe442867a (diff) | |
download | Ninja-559389de082406f44ae752a2494e53000d31a7df.zip Ninja-559389de082406f44ae752a2494e53000d31a7df.tar.gz Ninja-559389de082406f44ae752a2494e53000d31a7df.tar.bz2 |
remove CanonicalizePath overloads, test for toplevel behaviour
Diffstat (limited to 'src/util_test.cc')
-rw-r--r-- | src/util_test.cc | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/util_test.cc b/src/util_test.cc index d047d9c..82db6d2 100644 --- a/src/util_test.cc +++ b/src/util_test.cc @@ -16,6 +16,15 @@ #include "test.h" +namespace { + +bool CanonicalizePath(string* path, string* err) { + unsigned int unused; + return ::CanonicalizePath(path, err, &unused); +} + +} // namespace + TEST(CanonicalizePath, PathSamples) { string path; string err; @@ -275,16 +284,17 @@ TEST(CanonicalizePath, NotNullTerminated) { string path; string err; size_t len; + unsigned int unused; path = "foo/. bar/."; len = strlen("foo/."); // Canonicalize only the part before the space. - EXPECT_TRUE(CanonicalizePath(&path[0], &len, &err)); + EXPECT_TRUE(CanonicalizePath(&path[0], &len, &err, &unused)); EXPECT_EQ(strlen("foo"), len); EXPECT_EQ("foo/. bar/.", string(path)); path = "foo/../file bar/."; len = strlen("foo/../file"); - EXPECT_TRUE(CanonicalizePath(&path[0], &len, &err)); + EXPECT_TRUE(CanonicalizePath(&path[0], &len, &err, &unused)); EXPECT_EQ(strlen("file"), len); EXPECT_EQ("file ./file bar/.", string(path)); } |