diff options
author | Scott Graham <scottmg@chromium.org> | 2015-06-09 00:17:55 (GMT) |
---|---|---|
committer | Scott Graham <scottmg@chromium.org> | 2015-06-09 00:17:55 (GMT) |
commit | 1493c6a0b0f779294b870ae8ee4a8515087ac64e (patch) | |
tree | f46ba40a191693e81d0ee3c55ce0eea2b127553d /src/includes_normalize_test.cc | |
parent | a2d1cf2f26bdd7a326a3ef6186ee507fd87868d0 (diff) | |
download | Ninja-1493c6a0b0f779294b870ae8ee4a8515087ac64e.zip Ninja-1493c6a0b0f779294b870ae8ee4a8515087ac64e.tar.gz Ninja-1493c6a0b0f779294b870ae8ee4a8515087ac64e.tar.bz2 |
push error to caller and abort on failure
Diffstat (limited to 'src/includes_normalize_test.cc')
-rw-r--r-- | src/includes_normalize_test.cc | 83 |
1 files changed, 50 insertions, 33 deletions
diff --git a/src/includes_normalize_test.cc b/src/includes_normalize_test.cc index b3519e2..aba25d0 100644 --- a/src/includes_normalize_test.cc +++ b/src/includes_normalize_test.cc @@ -21,13 +21,6 @@ #include "test.h" #include "util.h" -TEST(IncludesNormalize, Simple) { - EXPECT_EQ("b", IncludesNormalize::Normalize("a\\..\\b", NULL)); - EXPECT_EQ("b", IncludesNormalize::Normalize("a\\../b", NULL)); - EXPECT_EQ("a/b", IncludesNormalize::Normalize("a\\.\\b", NULL)); - EXPECT_EQ("a/b", IncludesNormalize::Normalize("a\\./b", NULL)); -} - namespace { string GetCurDir() { @@ -37,28 +30,50 @@ string GetCurDir() { return parts[parts.size() - 1]; } +string NormalizeAndCheckNoError(const std::string& input) { + string result, err; + EXPECT_TRUE(IncludesNormalize::Normalize(input.c_str(), NULL, &result, &err)); + EXPECT_EQ("", err); + return result; +} + +string NormalizeRelativeAndCheckNoError(const std::string& input, + const std::string& relative_to) { + string result, err; + EXPECT_TRUE(IncludesNormalize::Normalize(input.c_str(), relative_to.c_str(), + &result, &err)); + EXPECT_EQ("", err); + return result; +} + } // namespace +TEST(IncludesNormalize, Simple) { + EXPECT_EQ("b", NormalizeAndCheckNoError("a\\..\\b")); + EXPECT_EQ("b", NormalizeAndCheckNoError("a\\../b")); + EXPECT_EQ("a/b", NormalizeAndCheckNoError("a\\.\\b")); + EXPECT_EQ("a/b", NormalizeAndCheckNoError("a\\./b")); +} + TEST(IncludesNormalize, WithRelative) { string currentdir = GetCurDir(); - EXPECT_EQ("c", IncludesNormalize::Normalize("a/b/c", "a/b")); - EXPECT_EQ("a", IncludesNormalize::Normalize(IncludesNormalize::AbsPath("a"), - NULL)); + EXPECT_EQ("c", NormalizeRelativeAndCheckNoError("a/b/c", "a/b")); + EXPECT_EQ("a", NormalizeAndCheckNoError(IncludesNormalize::AbsPath("a"))); EXPECT_EQ(string("../") + currentdir + string("/a"), - IncludesNormalize::Normalize("a", "../b")); + NormalizeRelativeAndCheckNoError("a", "../b")); EXPECT_EQ(string("../") + currentdir + string("/a/b"), - IncludesNormalize::Normalize("a/b", "../c")); - EXPECT_EQ("../../a", IncludesNormalize::Normalize("a", "b/c")); - EXPECT_EQ(".", IncludesNormalize::Normalize("a", "a")); + NormalizeRelativeAndCheckNoError("a/b", "../c")); + EXPECT_EQ("../../a", NormalizeRelativeAndCheckNoError("a", "b/c")); + EXPECT_EQ(".", NormalizeRelativeAndCheckNoError("a", "a")); } TEST(IncludesNormalize, Case) { - EXPECT_EQ("b", IncludesNormalize::Normalize("Abc\\..\\b", NULL)); - EXPECT_EQ("BdEf", IncludesNormalize::Normalize("Abc\\..\\BdEf", NULL)); - EXPECT_EQ("A/b", IncludesNormalize::Normalize("A\\.\\b", NULL)); - EXPECT_EQ("a/b", IncludesNormalize::Normalize("a\\./b", NULL)); - EXPECT_EQ("A/B", IncludesNormalize::Normalize("A\\.\\B", NULL)); - EXPECT_EQ("A/B", IncludesNormalize::Normalize("A\\./B", NULL)); + EXPECT_EQ("b", NormalizeAndCheckNoError("Abc\\..\\b")); + EXPECT_EQ("BdEf", NormalizeAndCheckNoError("Abc\\..\\BdEf")); + EXPECT_EQ("A/b", NormalizeAndCheckNoError("A\\.\\b")); + EXPECT_EQ("a/b", NormalizeAndCheckNoError("a\\./b")); + EXPECT_EQ("A/B", NormalizeAndCheckNoError("A\\.\\B")); + EXPECT_EQ("A/B", NormalizeAndCheckNoError("A\\./B")); } TEST(IncludesNormalize, Join) { @@ -91,18 +106,18 @@ TEST(IncludesNormalize, ToLower) { TEST(IncludesNormalize, DifferentDrive) { EXPECT_EQ("stuff.h", - IncludesNormalize::Normalize("p:\\vs08\\stuff.h", "p:\\vs08")); + NormalizeRelativeAndCheckNoError("p:\\vs08\\stuff.h", "p:\\vs08")); EXPECT_EQ("stuff.h", - IncludesNormalize::Normalize("P:\\Vs08\\stuff.h", "p:\\vs08")); + NormalizeRelativeAndCheckNoError("P:\\Vs08\\stuff.h", "p:\\vs08")); EXPECT_EQ("p:/vs08/stuff.h", - IncludesNormalize::Normalize("p:\\vs08\\stuff.h", "c:\\vs08")); - EXPECT_EQ("P:/vs08/stufF.h", - IncludesNormalize::Normalize("P:\\vs08\\stufF.h", "D:\\stuff/things")); - EXPECT_EQ("P:/vs08/stuff.h", - IncludesNormalize::Normalize("P:/vs08\\stuff.h", "D:\\stuff/things")); + NormalizeRelativeAndCheckNoError("p:\\vs08\\stuff.h", "c:\\vs08")); + EXPECT_EQ("P:/vs08/stufF.h", NormalizeRelativeAndCheckNoError( + "P:\\vs08\\stufF.h", "D:\\stuff/things")); + EXPECT_EQ("P:/vs08/stuff.h", NormalizeRelativeAndCheckNoError( + "P:/vs08\\stuff.h", "D:\\stuff/things")); EXPECT_EQ("P:/wee/stuff.h", - IncludesNormalize::Normalize("P:/vs08\\../wee\\stuff.h", - "D:\\stuff/things")); + NormalizeRelativeAndCheckNoError("P:/vs08\\../wee\\stuff.h", + "D:\\stuff/things")); } TEST(IncludesNormalize, LongInvalidPath) { @@ -112,9 +127,11 @@ TEST(IncludesNormalize, LongInvalidPath) { "pdb (for example, mspdb110.dll) could not be found on your path. This " "is usually a configuration error. Compilation will continue using /Z7 " "instead of /Zi, but expect a similar error when you link your program."; - // Too long, won't be canonicalized, but just don't crash. - EXPECT_EQ(kLongInputString, - IncludesNormalize::Normalize(kLongInputString, NULL)); + // Too long, won't be canonicalized. Ensure doesn't crash. + string result, err; + EXPECT_FALSE( + IncludesNormalize::Normalize(kLongInputString, NULL, &result, &err)); + EXPECT_EQ("path too long", err); const char kExactlyMaxPath[] = "012345678\\" @@ -147,5 +164,5 @@ TEST(IncludesNormalize, LongInvalidPath) { std::replace(forward_slashes.begin(), forward_slashes.end(), '\\', '/'); // Make sure a path that's exactly _MAX_PATH long is canonicalized. EXPECT_EQ(forward_slashes, - IncludesNormalize::Normalize(kExactlyMaxPath, NULL)); + NormalizeAndCheckNoError(kExactlyMaxPath)); } |