diff options
author | Thiago Farina <tfransosi@gmail.com> | 2011-03-19 21:53:43 (GMT) |
---|---|---|
committer | Evan Martin <martine@danga.com> | 2011-04-15 19:20:51 (GMT) |
commit | 89a75eff08cd7355f07235938aff4769f97068e5 (patch) | |
tree | fff51cd97b561d91ef6a670d21116cd0b03543e9 /src/graph_test.cc | |
parent | 343c526e6a0c35816c4876bfc923cef15ef7a989 (diff) | |
download | Ninja-89a75eff08cd7355f07235938aff4769f97068e5.zip Ninja-89a75eff08cd7355f07235938aff4769f97068e5.tar.gz Ninja-89a75eff08cd7355f07235938aff4769f97068e5.tar.bz2 |
Move CanonicalizePath into util.h so it can be shared by the other modules.
Also add util_test.cc and move the CanonicalizePathTest into there.
Signed-off-by: Thiago Farina <tfarina@chromium.org>
Diffstat (limited to 'src/graph_test.cc')
-rw-r--r-- | src/graph_test.cc | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/src/graph_test.cc b/src/graph_test.cc index b67cf99..ba41440 100644 --- a/src/graph_test.cc +++ b/src/graph_test.cc @@ -16,39 +16,6 @@ #include "test.h" -TEST(CanonicalizePath, PathSamples) { - string path = "foo.h"; - string err; - EXPECT_TRUE(CanonicalizePath(&path, &err)); - EXPECT_EQ("", err); - EXPECT_EQ("foo.h", path); - - path = "./foo.h"; err = ""; - EXPECT_TRUE(CanonicalizePath(&path, &err)); - EXPECT_EQ("", err); - EXPECT_EQ("foo.h", path); - - path = "./foo/./bar.h"; err = ""; - EXPECT_TRUE(CanonicalizePath(&path, &err)); - EXPECT_EQ("", err); - EXPECT_EQ("foo/bar.h", path); - - path = "./x/foo/../bar.h"; err = ""; - EXPECT_TRUE(CanonicalizePath(&path, &err)); - EXPECT_EQ("", err); - EXPECT_EQ("x/bar.h", path); - - path = "./x/foo/../../bar.h"; err = ""; - EXPECT_TRUE(CanonicalizePath(&path, &err)); - EXPECT_EQ("", err); - EXPECT_EQ("bar.h", path); - - path = "./x/../foo/../../bar.h"; err = ""; - EXPECT_FALSE(CanonicalizePath(&path, &err)); - EXPECT_EQ("can't canonicalize path './x/../foo/../../bar.h' that reaches " - "above its directory", err); -} - struct GraphTest : public StateTestWithBuiltinRules { VirtualFileSystem fs_; }; |