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>

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_;
 };