diff options
| author | Nico Weber <nicolasweber@gmx.de> | 2014-11-12 20:40:57 (GMT) |
|---|---|---|
| committer | Nico Weber <nicolasweber@gmx.de> | 2014-11-12 20:40:57 (GMT) |
| commit | 23c11b4efae2e1a8aeeb98aaaed96ad6ec76b460 (patch) | |
| tree | b94e0121ea799081509a2365ed36a2026b4ef6a4 /src/util_test.cc | |
| parent | 6aa1b4b6d3d2d3efa55f91649271ed253ef5cab7 (diff) | |
| parent | fb320646918dac633bdb4e449e7d0f372d83d01d (diff) | |
| download | Ninja-23c11b4efae2e1a8aeeb98aaaed96ad6ec76b460.zip Ninja-23c11b4efae2e1a8aeeb98aaaed96ad6ec76b460.tar.gz Ninja-23c11b4efae2e1a8aeeb98aaaed96ad6ec76b460.tar.bz2 | |
Merge pull request #849 from sgraham/set-err-canon-components
set *err when too many components in CanonicalizePath
Diffstat (limited to 'src/util_test.cc')
| -rw-r--r-- | src/util_test.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/util_test.cc b/src/util_test.cc index 5bbf397..13730af 100644 --- a/src/util_test.cc +++ b/src/util_test.cc @@ -272,15 +272,19 @@ TEST(CanonicalizePath, TooManyComponents) { EXPECT_EQ(slash_bits, 0xffff); // 33 is not. + err = ""; path = "a/./a/./a/./a/./a/./a/./a/./a/./a/./a/./a/./a/./a/./a/./a/./a/./a/x.h"; EXPECT_FALSE(CanonicalizePath(&path, &slash_bits, &err)); + EXPECT_EQ(err, "too many path components"); // Backslashes version. + err = ""; path = "a\\.\\a\\.\\a\\.\\a\\.\\a\\.\\a\\.\\a\\.\\a\\.\\a\\.\\a\\.\\a\\.\\a\\." "\\a\\.\\a\\.\\a\\.\\a\\.\\a\\x.h"; EXPECT_FALSE(CanonicalizePath(&path, &slash_bits, &err)); + EXPECT_EQ(err, "too many path components"); } #endif |